doxygen: some code shuffle to prevent clashing file names, ensure MEM_guardedalloc.h also shows in docs
This commit is contained in:
parent
e46da7166b
commit
d9563f5e2b
|
@ -27,6 +27,7 @@
|
|||
*/
|
||||
|
||||
/** \file MEM_guardedalloc.h
|
||||
* \ingroup MEM
|
||||
*
|
||||
* \author Copyright (C) 2001 NaN Technologies B.V.
|
||||
* \brief Guarded memory (de)allocation
|
||||
|
@ -55,7 +56,7 @@
|
|||
#define MEM_MALLOCN_H
|
||||
|
||||
#include "stdio.h" /* needed for FILE* */
|
||||
#include "BLO_sys_types.h" /* needed for uintptr_t */
|
||||
#include "MEM_sys_types.h" /* needed for uintptr_t */
|
||||
|
||||
#ifndef WARN_UNUSED
|
||||
# ifdef __GNUC__
|
||||
|
|
|
@ -40,11 +40,12 @@
|
|||
/*
|
||||
// DG: original BLO_sys_types.h is in source/blender/blenkernel
|
||||
// but is not allowed be accessed here because of bad-level-call
|
||||
// jesterKing: I've renamed this to MEM_sys_types.h, because otherwise
|
||||
// doxygen would get a conflict
|
||||
*/
|
||||
|
||||
/** \file BLO_sys_types.h
|
||||
/** \file MEM_sys_types.h
|
||||
* \ingroup MEM
|
||||
* \todo solve naming issue BLO -> MEM
|
||||
*/
|
||||
|
||||
#ifndef BLO_SYS_TYPES_H
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
#define MAP_FAILED ((void *)-1)
|
||||
|
||||
#include "BLO_sys_types.h" // needed for intptr_t
|
||||
#include "MEM_sys_types.h" // needed for intptr_t
|
||||
|
||||
void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
|
||||
intptr_t munmap(void *ptr, intptr_t size);
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#define MEM_ALLOCATOR_H
|
||||
|
||||
#include "guardedalloc/MEM_guardedalloc.h"
|
||||
#include "guardedalloc/BLO_sys_types.h"
|
||||
#include "guardedalloc/MEM_sys_types.h"
|
||||
|
||||
template<typename _Tp>
|
||||
struct MEM_Allocator
|
||||
|
|
Loading…
Reference in New Issue