Changeset 7061 for trunk

Timestamp:

2004-03-16T16:21:03+13:00 (20 years ago)

Author:

sjboddie

Message:

Fixed up the sstream stuff in browsetools.cpp so it compiles under VC4

File:

• trunk/gsdl/src/recpt/browsetools.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -31 +31 @@
 #include "gsdlunicode.h"
 
-#include <sstream>
+#if defined(GSDL_USE_IOS_H)
+#  if defined(__WIN32__)
+#    include <strstrea.h> // vc4
+#  else
+#    include <strstream.h>
+#  endif
+#else
+#  include <sstream>
+#endif
 
 
@@ -836 +844 @@
   options["DocImage"] = get_cover_image();
 
-  ostringstream tmpstr(ostringstream::binary);
+#if defined(GSDL_USE_IOS_H)
+  ostrstream *tmpstr = new ostrstream();
+#else
+  ostringstream *tmpstr = new ostringstream(ostringstream::binary);
+#endif
+
   if (args["gc"] == "1") {
     expanded_contents (args, 0, false, browsers, formatinfo, 
-               collectproto, disp, outconvert, tmpstr,
+               collectproto, disp, outconvert, *tmpstr,
                logout);
   } else {
     contracted_contents (args, 0, false, browsers, formatinfo, 
-             collectproto, disp, outconvert, tmpstr, logout);
-  }
-  text_t tmp = (char *)(tmpstr.str().c_str());
+             collectproto, disp, outconvert, *tmpstr, logout);
+  }
+#if defined(GSDL_USE_IOS_H)
+  char *t = tmpstr->str();
+  text_t tmp;
+  tmp.setcarr(t, tmpstr->pcount());
+  delete [] t;
+#else
+  text_t tmp = (char *)(tmpstr->str().c_str());
+#endif
   int len = tmp.size();
   char *ctmp = tmp.getcstr();
@@ -854 +874 @@
   options["DocTOC"] = tmp;
   delete ctmp;
+  delete tmpstr;
 
   options["DocumentButtonDetach"] = "_document:imagedetach_";