Changes in / [33d774:c7b39a]

Location:

src

Files:

• Helpers/MemDebug.cpp (modified) (2 diffs)
• Helpers/MemDebug.hpp (modified) (3 diffs)
• UIElements/TextUI/TextWindow.hpp (modified) (1 diff)

src/Helpers/MemDebug.cpp

@@ -6 +6 @@
  */
 
-#ifndef NDEBUG
-#ifndef NO_MEMDEBUG
+// 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 <iostream>
@@ -489 +506 @@
 }
 #endif
-#endif

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>
@@ -83 +99 @@
 #endif
 
-#endif
-#endif
-
-
-#ifdef NDEBUG
-#undef MEMDEBUG
-#endif
-
-#ifndef MEMDEBUG
+#else
 // memory debugging was disabled
 
@@ -104 +112 @@
 
 #endif
+
+
 #endif /* MEMDEBUG_HPP_ */

src/UIElements/TextUI/TextWindow.hpp

@@ -11 +11 @@
 #include "MainWindow.hpp"
 
+#include <string>
 #include <set>