Use matching quote.

[loba.git] / misc.h

diff --git a/misc.h b/misc.h
index 974f66608ebf3dbea68a531547011a360bd2e304..8700b96afb4d3ca42152b66d459c1c30406596e4 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,9 +1,15 @@
 #ifndef MISC_H
 #define MISC_H
 
 #ifndef MISC_H
 #define MISC_H
 

-#include <functional>

 #include <xbt/log.h>
 
 #include <xbt/log.h>
 

+/* Returns c-string "s" if n > 1, empty string "" otherwise. */
+#define ESSE(n) (misc::str_esse + ((n) <= 1))
+
+namespace misc {
+    extern const char str_esse[];
+}
+

 /* Returns true if the given priority is enabled for the default
  * category.  Priority is xbt_log_priority_SUFFIX, where SUFFIX may
  * be: trace, debug, verbose, info, warning, error, critical.
 /* Returns true if the given priority is enabled for the default
  * category.  Priority is xbt_log_priority_SUFFIX, where SUFFIX may
  * be: trace, debug, verbose, info, warning, error, critical.


@@ -11,25 +17,10 @@
 #define LOG_ISENABLED(priority) \
     (_XBT_LOG_ISENABLEDV((*_XBT_LOGV(default)), (priority)))
 
 #define LOG_ISENABLED(priority) \
     (_XBT_LOG_ISENABLEDV((*_XBT_LOGV(default)), (priority)))
 

-/* Defines XCLOGn(...) which behave like CLOGn(...), except that the
+/* Defines XBT_XCLOG(...) which behave like XBT_CLOG(...), except that the

  * given category is not passed through _XBT_LOGV before use.
  * given category is not passed through _XBT_LOGV before use.

- * (auto-generated, like its name says...)

  */
  */

-#include "misc_autogen.h"
-
-/* Returns c-string "s" if n > 1, empty string "" otherwise. */
-#define ESSE(n) ((n) > 1 ? misc::str_esse : misc::str_nil)
-namespace misc {
-
-    extern const char str_esse[];
-    extern const char str_nil[];
-
-    template <typename T>
-    struct address: public std::unary_function<T&, T*> {
-        T* operator()(T& ref) { return &ref; }
-    };
-
-}
+#define XBT_XCLOG(c, p, ...) XBT_CLOG((*(c)), p, __VA_ARGS__)

 
 #endif // !MISC_H
 
 
 #endif // !MISC_H