[ViewVC] Diff of: cvs/deliantra/server/include/shstr.h

Comparing deliantra/server/include/shstr.h (file contents):
Revision 1.25 by root, Wed Dec 31 18:07:41 2008 UTC vs.
Revision 1.26 by root, Wed Dec 31 18:25:12 2008 UTC

   // this is used for informational messages and the like
   const char *operator &() const { return s; }
   operator const char *() const { return s == null () ? 0 : s; }
+protected:
+  // dummy is there so it isn't used as type converter accidentally
+  shstr_tmp (int dummy, const char *s)
+  : s(s)
+  {
+  }
 };
 inline bool operator ==(const shstr_tmp &a, const shstr_tmp &b)
 {
   return a.s == b.s;
   {
     ++refcnt ();
   }
   explicit shstr (const char *str)
-  {
-    s = is_constant (str) && !str ? null () : intern (str);
+  : shstr_tmp (0, is_constant (str) && !str ? null () : intern (str))
+  {
   }
   ~shstr ()
   {
     --refcnt ();
 inline bool operator ==(const shstr_tmp &a, const shstr_cmp &b)
 {
   return a.s == b.s;
 }
+struct shstr_const : shstr_tmp
+{
+  shstr_const (const char *s)
+  : shstr_tmp (0, s)
+  {
+  }
+};
-#define def(str) extern const shstr shstr_ ## str;
+#define def(str) extern const shstr_const shstr_ ## str;
 # include "shstrinc.h"
 #undef def
 #endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines