--- deliantra/server/include/dynbuf.h	2008/05/06 16:55:25	1.17
+++ deliantra/server/include/dynbuf.h	2009/10/15 22:50:42	1.24
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -24,6 +25,7 @@
 #ifndef DYNBUF_H__
 #define DYNBUF_H__
 
+#include <cstdarg>
 #include <cstring>
 #include <cassert>
 
@@ -50,7 +52,7 @@
   char *ptr, *end;
   int _size;
 
-  int extend;
+  int extend, cextend;
   chunk *first, *last;
 
   void reserve (int size);
@@ -134,7 +136,7 @@
      add (s, strlen (s));
   }
 
-  void add (const shstr &s)
+  void add (shstr_tmp s)
   {
     add (s.s, s.length ());
   }
@@ -145,7 +147,7 @@
   dynbuf &operator << (char c) { add (c); return *this; }
   dynbuf &operator << (unsigned char c) { return *this << char (c); }
   dynbuf &operator << (const char *s) { add (s); return *this; }
-  dynbuf &operator << (const shstr &s) { add (s); return *this; }
+  dynbuf &operator << (shstr_tmp s) { add (s); return *this; }
   dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; }
 
   operator std::string ();
@@ -163,7 +165,11 @@
 
   //TODO: should optimise the case printf "(name %+d)" as it comes up extremely often
 
-  using dynbuf::operator <<;
+  //using dynbuf::operator <<; // doesn't work, sometimes C++ just suxx
+  // instead we use an ugly template function
+  template<typename T>
+  dynbuf_text &operator << (T c) { *(dynbuf *)this << c; return *this; }
+
   dynbuf_text &operator << (sint16 i) { add (sint32 (i)); return *this; }
   dynbuf_text &operator << (uint16 i) { add (sint32 (i)); return *this; }
   dynbuf_text &operator << (sint32 i) { add (sint32 (i)); return *this; }
@@ -178,7 +184,7 @@
   void add_paths     (const char *name, uint32 paths);
 
   // returns the string, linearised and with trailing \0
-  operator const char * ();
+  operator char *();
 };
 
 #endif