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

File:

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

src/Helpers/MemDebug.hpp

@@ -28 +28 @@
 #endif
 
-#include <cstdlib>
 #include <new>
+
+// some light header files, that do weird new stuff and therefore need
+// to be loaded before the define
+#include <string>
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <boost/program_options.hpp>
+
 
 namespace Memory {
@@ -53 +60 @@
   }
 }
-
+#ifdef __GNUC__
+void *operator new   (size_t nbytes,const char* file, int line, const char* func) throw(std::bad_alloc);
+void *operator new[] (size_t nbytes,const char* file, int line, const char* func) throw(std::bad_alloc);
+#else
 void *operator new   (size_t nbytes,const char* file, int line) throw(std::bad_alloc);
 void *operator new[] (size_t nbytes,const char* file, int line) throw(std::bad_alloc);
+#endif
 void operator delete   (void *ptr,const char*, int) throw();
 void operator delete[] (void *ptr,const char*, int) throw();
+
+
 
 /**
@@ -63 +76 @@
  * version that allows tracking.
  */
+#ifdef __GNUC__
+#define new new(__FILE__,__LINE__,__PRETTY_FUNCTION__)
+#else
 #define new new(__FILE__,__LINE__)
+#endif
 
 #endif
 #endif
 
+
+#ifdef NDEBUG
+#undef MEMDEBUG
+#endif
 
 #ifndef MEMDEBUG