Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
ca5d9619bd
2 changed files with 2 additions and 2 deletions
  1. 0 1
      dtool/src/dtoolbase/dtoolbase_cc.h
  2. 2 1
      dtool/src/dtoolbase/fakestringstream.h

+ 0 - 1
dtool/src/dtoolbase/dtoolbase_cc.h

@@ -72,7 +72,6 @@ using namespace std;
   exptp template class expcl classname;
   exptp template class expcl classname;
 #else
 #else
 #define EXPORT_TEMPLATE_CLASS(expcl, exptp, classname)
 #define EXPORT_TEMPLATE_CLASS(expcl, exptp, classname)
-#define INLINE inline
 #endif
 #endif
 
 
 // We define the macro PUBLISHED to mark C++ methods that are to be
 // We define the macro PUBLISHED to mark C++ methods that are to be

+ 2 - 1
dtool/src/dtoolbase/fakestringstream.h

@@ -70,8 +70,9 @@ public:
     _owns_str = false;
     _owns_str = false;
   }
   }
   string str() {
   string str() {
+    int length = pcount();
     char *s = strstream::str();
     char *s = strstream::str();
-    string result(s);
+    string result(s, length);
     if (_owns_str) {
     if (_owns_str) {
       delete[] s;
       delete[] s;
     }
     }