doxygen: some code shuffle to prevent clashing file names, ensure MEM_guardedalloc...

diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 8d8557f2d31e4513c3bf468b382f8d16e87d8ec5..844622737b4372abfdf4f206cbe7f578840c35be 100644 (file)
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -27,6 +27,7 @@
  */
 
 /** \file MEM_guardedalloc.h
  */
 
 /** \file MEM_guardedalloc.h

+ *  \ingroup MEM

  *
  *  \author Copyright (C) 2001 NaN Technologies B.V.
  *  \brief Guarded memory (de)allocation
  *
  *  \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* */
 #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__
 
 #ifndef WARN_UNUSED
 #  ifdef __GNUC__

diff --git a/intern/guardedalloc/BLO_sys_types.h b/intern/guardedalloc/MEM_sys_types.h
similarity index 96%
rename from intern/guardedalloc/BLO_sys_types.h
rename to intern/guardedalloc/MEM_sys_types.h
index a0a96cdeba8d304c68621df4227a3fc10471d45f..ff945a8c0c1a44ca92d5b76ca420bea7bd15e778 100644 (file)
--- a/intern/guardedalloc/BLO_sys_types.h
+++ b/intern/guardedalloc/MEM_sys_types.h
@@ -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
 /* 
 // 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
  *  \ingroup MEM

- *  \todo solve naming issue BLO -> MEM

  */
 
 #ifndef BLO_SYS_TYPES_H
  */
 
 #ifndef BLO_SYS_TYPES_H

diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h
index 0ea3df67a104695d507d6e9d76df5129bbe63e3d..7e85a79a2ac841307c516254b780188f4e99a700 100644 (file)
--- a/intern/guardedalloc/mmap_win.h
+++ b/intern/guardedalloc/mmap_win.h
@@ -50,7 +50,7 @@
 
 #define MAP_FAILED ((void *)-1)
 
 
 #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);
 
 void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
 intptr_t munmap(void *ptr, intptr_t size);

diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h
index 56c5fc80035b651bbd5962a46ce67c7f1507e67a..c9975b1e5631b62ecad9a9d022caeb56063ff770 100644 (file)
--- a/intern/memutil/MEM_Allocator.h
+++ b/intern/memutil/MEM_Allocator.h
@@ -25,7 +25,7 @@
 #define MEM_ALLOCATOR_H
 
 #include "guardedalloc/MEM_guardedalloc.h"
 #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
 
 template<typename _Tp>
 struct MEM_Allocator