Moving defition of CString back into StdString.h

* was moved in e54e5c0959299034dfd7f594877805f536bfb7d3
* not sure why
* CR: infamouspat

diff --git a/src/StdString.h b/src/StdString.h
index 71b5acb..624f290 100755 (executable)
--- a/src/StdString.h
+++ b/src/StdString.h
@@ -105,6 +105,7 @@ typedef char*                       PSTR;
 #include <cstdlib>\r
 #include <cstdarg>\r
 #include <cstring>\r
+#include <vector>\r
 \r
 // a very shorthand way of applying the fix for KB problem Q172398\r
 // (basic_string assignment bug)\r
@@ -781,6 +782,13 @@ struct StdStringEqualsNoCase
        #pragma warning (pop)\r
 #endif\r
 \r
+/* Use CStdString: */\r
+#include "StdString.h"\r
+typedef StdString::CStdString CString;\r
+typedef std::vector<CString> CStringArray;\r
+\r
+typedef const CString& CCStringRef;\r
+\r
 #endif // #ifndef STDSTRING_H\r
 \r
 /*\r

diff --git a/src/global.h b/src/global.h
index 310b0bd..69692f1 100755 (executable)
--- a/src/global.h
+++ b/src/global.h
@@ -128,6 +128,9 @@ void NORETURN sm_crash( const char *reason = "Internal error" );
 void ShowWarning( const char *file, int line, const char *message ); // don't pull in LOG here
 #define WARN(MESSAGE) (ShowWarning(__FILE__, __LINE__, MESSAGE))
 
+/* Use CStdString: */
+#include "StdString.h"
+
 #ifdef DEBUG
 #define DEBUG_ASSERT(x)                ASSERT(x)
 #define DEBUG_ASSERT_M(x,y)    ASSERT_M(x,y)
@@ -152,13 +155,6 @@ void ShowWarning( const char *file, int line, const char *message ); // don't pu
 #endif
 #endif
 
-/* Use CStdString: */
-#include "StdString.h"
-typedef StdString::CStdString CString;
-typedef vector<CString> CStringArray;
-
-typedef const CString& CCStringRef;
-
 /* Include this here to make sure our assertion handler is always
  * used.  (This file is a dependency of most everything anyway,
  * so there's no real problem putting it here.) */