foundational changes; tying up some loose ends

[chaz/yoink] / src / Moof / Log.hh

diff --git a/src/Moof/Log.hh b/src/Moof/Log.hh
index 1f9d0c6b084d9a6f404f3ec756d7c6eb9418c9c2..d3aa555aac4c5fa4b81076de90a595612ca28883 100644 (file)
--- a/src/Moof/Log.hh
+++ b/src/Moof/Log.hh
@@ -44,11 +44,13 @@
  * @param X test to perform
  */
 
-#if ! NDEBUG
+#undef ASSERT
+
+#if NDEBUG
+#define ASSERT(X)
+#else
 #define ASSERT(X) if (!(X)) Mf::logError("false assertion at %s:%d, " #X, \
                __FILE__, __LINE__), exit(1)
-#else
-#define ASSERT(X)
 #endif
 
 
@@ -117,7 +119,7 @@ void logDebug(const char* fmt, ...);
 void logScript(const char* fmt, ...);
 class Script;
 int logScript(Script& script);
-void importLogScript(Script& script);
+void importLogPrintFunction(Script& script);
 
 
 } // namespace Mf