- put everything in "GiNaC" namespace

[ginac.git] / ginac / debugmsg.h

diff --git a/ginac/debugmsg.h b/ginac/debugmsg.h
index 13bd156850d8c39aba3e181237fd6746c8d799e5..24d0f7e90a06153f582b38a4310d994a608a7c4d 100644 (file)
--- a/ginac/debugmsg.h
+++ b/ginac/debugmsg.h
@@ -23,6 +23,8 @@
 #ifndef __GINAC_DEBUGMSG_H__
 #define __GINAC_DEBUGMSG_H__
 
+#include <iostream>
+
 #ifdef _DEBUG
 #define VERBOSE
 #define DOASSERT (VERBOSE||DEBUG)
@@ -39,10 +41,7 @@
 #define LOGLEVEL_ALL                0xffff
 
 #define LOGMASK (LOGLEVEL_PRINT)
-// #define LOGMASK (LOGLEVEL_PRINT | LOGLEVEL_ASSIGNMENT | LOGLEVEL_OPERATOR | LOGLEVEL_DUPLICATE | LOGLEVEL_OPERATOR | LOGLEVEL_MEMBER_FUNCTION | LOGLEVEL_NONMEMBER_FUNCTION )
-
-#include <assert.h>
-#include <iostream>
+// #define LOGMASK (LOGLEVEL_PRINT | LOGLEVEL_ASSIGNMENT | LOGLEVEL_OPERATOR | LOGLEVEL_DUPLICATE | LOGLEVEL_OPERATOR | LOGLEVEL_MEMBER_FUNCTION | LOGLEVEL_NONMEMBER_FUNCTION)
 
 #ifdef VERBOSE
 #define debugmsg(msg, loglevel) if ((loglevel) & ~LOGMASK) clog << (msg) << endl;
@@ -50,10 +49,4 @@
 #define debugmsg(msg, loglevel)
 #endif // def VERBOSE
 
-#ifdef DOASSERT
-#define ASSERT(X) assert(X)
-#else
-#define ASSERT(X) ((void)0)
-#endif
-
 #endif // ndef __GINAC_DEBUGMSG_H__