Merge remote-tracking branch 'origin/mdb.master'

[openldap] / contrib / ldapc++ / src / debug.h

diff --git a/contrib/ldapc++/src/debug.h b/contrib/ldapc++/src/debug.h
index 1001b930e50502e362760998144f75257f910e73..800de6891b932acc1f15184af9a62a31426a31a4 100644 (file)
--- a/contrib/ldapc++/src/debug.h
+++ b/contrib/ldapc++/src/debug.h
@@ -1,29 +1,33 @@
+// $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2012 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #ifndef DEBUG_H
 #define DEBUG_H
 #include <iostream>
-
+#include "config.h"
 #define LDAP_DEBUG_NONE         0x0000
 #define LDAP_DEBUG_TRACE        0x0001
-#define LDAP_DEBUG_RESPONSE     0x0002
-#define LDAP_DEBUG_REQUEST      0x0004
+#define LDAP_DEBUG_CONSTRUCT    0x0002
+#define LDAP_DEBUG_DESTROY      0x0004
 #define LDAP_DEBUG_PARAMETER    0x0008
-#define LDAP_DEBUG_ANY -1
+#define LDAP_DEBUG_ANY          0xffff 
 
 #define DEBUGLEVEL LDAP_DEBUG_ANY
 
 #define PRINT_FILE     \
-       cerr << "file: " __FILE__  << " line: " << __LINE__ 
+       std::cerr << "file: " __FILE__  << " line: " << __LINE__ 
 
+#ifdef WITH_DEBUG
 #define DEBUG(level, arg)       \
-    if(level & DEBUGLEVEL){     \
-        cerr  << arg ;          \
+    if((level) & DEBUGLEVEL){     \
+        std::cerr  << arg ;          \
     } 
-
-
+#else
+#undef DEBUG
+#define DEBUG(level,arg)
+#endif //WITH_DEBUG
 
 #endif // DEBUG_H