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

diff --git a/misc.cpp b/misc.cpp
index 06ec972dc2955f20b15bc2e7dc7554f7c6ab6563..1d15ac77864a84ffb08c8dd9025bc87663c7d559 100644 (file)
--- a/misc.cpp
+++ b/misc.cpp
@@ -1,6 +1,6 @@
 #include "misc.h"
 
 namespace misc {
 #include "misc.h"
 
 namespace misc {

+    // Defined here to avoid multiple instances.

     const char str_esse[] = "s";
     const char str_esse[] = "s";

-    const char str_nil[] = "";

 }
 }

diff --git a/misc.h b/misc.h
index 50a4d5d9f6cf513cc65e4040bee65b9ea3872d5e..72d98abd27ec5c5d7f5fd9d4e78a8bd45c550367 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -34,12 +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[];
-

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