--- deliantra/server/include/network.h	2008/09/08 11:27:25	1.22
+++ deliantra/server/include/network.h	2009/01/01 19:42:43	1.23
@@ -201,7 +201,7 @@
 
   data   (const void *ptr, int len) : len (len), ptr (ptr) { }
   data   (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
-  data   (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+  data   (shstr_tmp sh)    : len (sh.length ()), ptr ((void *)&sh) { }
   data   (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 
@@ -212,7 +212,7 @@
 
   data8  (const void *ptr, int len) : len (len), ptr (ptr) { }
   data8  (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
-  data8  (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+  data8  (shstr_tmp sh)    : len (sh.length ()), ptr ((void *)&sh) { }
   data8  (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 
@@ -223,7 +223,7 @@
 
   data16 (const void *ptr, int len) : len (len), ptr (ptr) { }
   data16 (const char *str) : len (strlen (str ? str : 0)), ptr ((void *)str) { }
-  data16 (const shstr &sh) : len (sh.length ()), ptr ((void *)&sh) { }
+  data16 (shstr_tmp sh)    : len (sh.length ()), ptr ((void *)&sh) { }
   data16 (dynbuf &buf)     : len (buf.size ()), ptr (buf.linearise ()) { }
 };
 
@@ -292,7 +292,7 @@
   packet &operator <<(const data16 &v);
 
   packet &operator <<(const char *v);
-  packet &operator <<(const shstr &sh) { return *this << data (&sh, sh.length ()); }
+  packet &operator <<(shstr_tmp sh) { return *this << data (sh); }
   packet &operator <<(const std::string &s) { return *this << data (s.data (), s.size ()); }
 
   void vprintf (const char *format, va_list ap);