Remove redundant includes.

[loba.git] / misc.h

diff --git a/misc.h b/misc.h
index a4a6db1e5bf141495b6977e1a59554921a68ee97..2ec625b943070406ffde59d903d9e87f12d2b1a5 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,6 +1,7 @@
 #ifndef MISC_H
 #define MISC_H
 
 #ifndef MISC_H
 #define MISC_H
 

+#include <functional>

 #include <xbt/log.h>
 
 /* Returns true if the given priority is enabled for the default
 #include <xbt/log.h>
 
 /* Returns true if the given priority is enabled for the default


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

+/* 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; }
+    };
+
+}
+

 #endif // !MISC_H
 
 // Local variables:
 #endif // !MISC_H
 
 // Local variables: