Changes in src/Helpers/MemDebug.hpp [6d6b54:097902]

File:

• src/Helpers/MemDebug.hpp (modified) (5 diffs)

src/Helpers/MemDebug.hpp

@@ -21 +21 @@
  * your sourcefiles.
  */
-#ifndef NDEBUG
-#ifndef NO_MEMDEBUG
 
-#ifndef MEMDEBUG
-#define MEMDEBUG
+// Set all flags in a way that makes sense
+
+// NDEBUG implies NO_MEMDEBUG
+#ifdef NDEBUG
+# ifndef NO_MEMDEBUG
+#   define NO_MEMDEBUG
+# endif
 #endif
+
+// NO_MEMDEBUG and MEMDEBUG are mutually exclusive, but at least one must be set
+#ifdef NO_MEMDEBUG
+# ifdef MEMDEBUG
+#   undef MEMDEBUG
+# endif
+#else
+# ifndef MEMDEBUG
+#   define MEMDEBUG
+# endif
+#endif
+
+#ifdef MEMDEBUG
 
 #include <new>
@@ -33 +49 @@
 // to be loaded before the define
 #include <string>
+#include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
@@ -44 +61 @@
    */
   void getState();
+  void dumpMemory(std::ostream&);
 
   void _ignore(void*);
@@ -82 +100 @@
 #endif
 
-#endif
-#endif
-
-
-#ifdef NDEBUG
-#undef MEMDEBUG
-#endif
-
-#ifndef MEMDEBUG
+#else
 // memory debugging was disabled
 
 namespace Memory {
   inline void getState(){}
+
+  inline void dumpMemory(std::ostream&){};
 
   template <typename T>
@@ -103 +115 @@
 
 #endif
+
+
 #endif /* MEMDEBUG_HPP_ */