Rewrite macro ESSE() and get rid of misc::str_nil.

[loba.git] / misc.h

diff --git a/misc.h b/misc.h
index 84f3ca17bb6ebb8096cea829f14bdfd46333cf52..72d98abd27ec5c5d7f5fd9d4e78a8bd45c550367 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -34,17 +34,10 @@
 #endif
 
 /* Returns c-string "s" if n > 1, empty string "" otherwise. */
 #endif
 
 /* Returns c-string "s" if n > 1, empty string "" otherwise. */

-#define ESSE(n) ((n) > 1 ? misc::str_esse : misc::str_nil)
-namespace misc {
+#define ESSE(n) (misc::str_esse + ((n) <= 1))

 
 

+namespace misc {

     extern const char str_esse[];
     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
 }
 
 #endif // !MISC_H