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

Comparing deliantra/server/include/shstr.h (file contents):
Revision 1.27 by root, Wed Dec 31 18:29:44 2008 UTC vs.
Revision 1.28 by root, Thu Jan 1 11:41:17 2009 UTC

   bool contains (const char *substring) const
   {
     return strstr (s, substring);
   }
+  //TODO: case sensitive should be eradicated
+  bool eq_nc (const char *otherstring) const
+  {
+    return !strcasecmp (s, otherstring);
+  }
   shstr_tmp ()
   : s (null ())
   {
   }
 inline int strlen (const shstr_tmp &sh)
 {
   return sh.length ();
 }
-// undefined external reference to catch people using strcmp when they shouldn't
-int strcmp (const shstr_tmp &a, const shstr_tmp &b);
 static std::ostream &operator <<(std::ostream &o, shstr_tmp sh)
 {
   o.write (sh.s, sh.length ());
   return o;
 // temporary passing, basically a non-refcounted shstr
 struct shstr_cmp
 {
   const char *s;
+  // initialies to the non-matching string (as opposed to the null string)
+  shstr_cmp ()
+  {
+    s = 0;
+  }
-  explicit shstr_cmp (const char *str)
+  shstr_cmp (const char *str)
   : s (shstr::find (str))
   {
   }
   shstr_cmp (shstr_tmp sh)
 inline bool operator ==(const shstr_tmp &a, const shstr_cmp &b)
 {
   return a.s == b.s;
 }
-#define def(str) extern const shstr shstr_ ## str;
+#define def2(id,str) extern const shstr shstr_ ## id;
+#define def(id)      def2(id, # id)
 # include "shstrinc.h"
 #undef def
+#undef def2
+// undefined external reference to catch people using str* functions when they shouldn't
+//template<class any> void strcmp (const shstr_tmp &a, any b);
+//template<class any> void strstr (const shstr_tmp &a, any b);
 #endif

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