Changeset 1203 for trunk/gsdl/src/w32server/cgiwrapper.cpp

Timestamp:

2000-06-12T14:49:06+12:00 (24 years ago)

Author:

sjboddie

Message:

Made a few minor changes to get the local library compiling under VC++ 6.0
using the built-in STL (i.e. without the GSDL_USE_IOS_H pre-processor
definition set).

File:

• trunk/gsdl/src/w32server/cgiwrapper.cpp (modified) (6 diffs)

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ +1 @@
+#include "text_t.h"
+
 #include <windows.h>
 #include <string.h>
@@ -77 +79 @@
   RequestInfoT *RInfo;
   ostream *casostr;
+#if !defined (GSDL_USE_IOS_H)
+  char buffer[256];
+#endif
 };
 
 textstreambuf::textstreambuf() {
   tsbreset();
+#if !defined (GSDL_USE_IOS_H)
+  setp (&buffer[0], &buffer[255]);
+#else
   if (base() == ebuf()) allocate();
   setp (base(), ebuf());
+#endif
 };
 
 int textstreambuf::sync () {
   if ((RInfo != NULL) && 
-      (Send_String_N(pbase(), out_waiting(), RInfo) < 0)) {
+      (Send_String_N(pbase(), pptr()-pbase(), RInfo) < 0)) {
     RInfo = NULL;
   }
@@ -93 +102 @@
   if (casostr != NULL) {
     char *thepbase=pbase();
-        for (int i=0;i<out_waiting();i++) (*casostr).put(thepbase[i]);
+    for (int i=0;i<(pptr()-pbase());i++) (*casostr).put(thepbase[i]);
   }
   
@@ -117 +126 @@
   int overflow (int ch);
   int underflow () {return EOF;}
+
+#if !defined (GSDL_USE_IOS_H)
+private:
+  char buffer[256];
+#endif
 };
 
 logstreambuf::logstreambuf () {
+#if !defined (GSDL_USE_IOS_H)
+  setp (&buffer[0], &buffer[255]);
+#else
   if (base() == ebuf()) allocate();
   setp (base(), ebuf());
+#endif
 }
 
@@ -127 +145 @@
   if (gsdl_keep_log || gsdl_show_console) {
     log_message ("LOCAL LIB MESSAGE: ");
-        log_message_N (pbase(), out_waiting());
+        log_message_N (pbase(), pptr()-pbase());
   }
 
@@ -304 +322 @@
 // returns 1 if successful, 0 if unsuccessful
 int gsdl_init () {
-  cerr = &logstream;
-  cout = &textstream;
+  cerr.rdbuf(&logstream);
+  cout.rdbuf(&textstream);
 
   // collection should be set to "" unless in