[Smartwin-cvs] SmartWin/SmartUtil tstring.h,1.10,1.11

[andrew7 <bd...@us...>]

Update of /cvsroot/smartwin/SmartWin/SmartUtil
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17721

Modified Files:
	tstring.h 
Log Message:
Patch

Index: tstring.h
===================================================================
RCS file: /cvsroot/smartwin/SmartWin/SmartUtil/tstring.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tstring.h	24 Dec 2006 15:53:39 -0000	1.10
+++ tstring.h	23 Jun 2007 13:05:31 -0000	1.11
@@ -30,6 +30,7 @@
 #include <iosfwd>
 #include <sstream>
 #include <algorithm>
+#include <string>
 
 #ifndef tstring_smartwin_H
 #define tstring_smartwin_H
@@ -39,52 +40,52 @@
 // begin namespace SmartUtil
 
 #if defined UNICODE || defined _UNICODE
-#   if defined _STRING_ || defined _CPP_STRING || defined _GLIBCXX_STRING
+#   if defined _STRING_ || defined _CPP_STRING || defined _GLIBCXX_STRING || defined _STLP_STRING
 		typedef std::wstring tstring;
 #   endif //_STRING_
-#   if defined _SSTREAM_ || defined _CPP_SSTREAM || defined _GLIBCXX_SSTREAM
+#   if defined _SSTREAM_ || defined _CPP_SSTREAM || defined _GLIBCXX_SSTREAM || defined _STLP_SSTREAM
 		typedef std::wstringstream tstringstream;
 		typedef std::wostringstream tostringstream;
 		typedef std::wistringstream tistringstream;
 #   endif //_SSTREAM_
-#   if defined _OSTREAM_ || defined _GLIBCXX_OSTREAM
+#   if defined _OSTREAM_ || defined _GLIBCXX_OSTREAM || defined _STLP_OSTREAM
 		typedef std::wostream tostream;
 #   endif //_OSTREAM_
-#   if defined _ISTREAM_ || defined _GLIBCXX_ISTREAM
+#   if defined _ISTREAM_ || defined _GLIBCXX_ISTREAM || defined _STLP_ISTREAM
 		typedef std::wistream tistream;
 #   endif //_ISTREAM_
-#   if defined _OSTREAM_ || defined _CPP_OSTREAM || defined _GLIBCXX_OSTREAM
-#   if defined _ISTREAM_ || defined _CPP_ISTREAM || defined _GLIBCXX_ISTREAM
+#   if defined _OSTREAM_ || defined _CPP_OSTREAM || defined _GLIBCXX_OSTREAM || defined _STLP_OSTREAM
+#   if defined _ISTREAM_ || defined _CPP_ISTREAM || defined _GLIBCXX_ISTREAM || defined _STLP_ISTREAM
 		typedef std::wiostream tiostream;
 #   endif //_ISTREAM_
 #   endif //_OSTREAM_
-#   if defined _IOSFWD_ || defined _FSTREAM_ || defined _CPP_FSTREAM || defined _GLIBCXX_FSTREAM
+#   if defined _IOSFWD_ || defined _FSTREAM_ || defined _CPP_FSTREAM || defined _GLIBCXX_FSTREAM || defined _STLP_FSTREAM
 		typedef std::wfilebuf tfilebuf;
 		typedef std::wfstream tfstream;
 		typedef std::wifstream tifstream;
 		typedef std::wofstream tofstream;
 #   endif //_FSTREAM_
 #else  // UNICODE
-#   if defined _STRING_ || defined _CPP_STRING || defined _GLIBCXX_STRING
+#   if defined _STRING_ || defined _CPP_STRING || defined _GLIBCXX_STRING || defined _STLP_STRING
 		typedef std::string tstring;
 #   endif //_STRING_
-#   if defined _SSTREAM_ || defined _CPP_SSTREAM || defined _GLIBCXX_SSTREAM
+#   if defined _SSTREAM_ || defined _CPP_SSTREAM || defined _GLIBCXX_SSTREAM || defined _STLP_SSTREAM
 		typedef std::stringstream tstringstream;
 		typedef std::ostringstream tostringstream;
 		typedef std::istringstream tistringstream;
 #   endif //_SSTREAM_
-#   if defined _OSTREAM_ || defined _GLIBCXX_OSTREAM
+#   if defined _OSTREAM_ || defined _GLIBCXX_OSTREAM || defined _STLP_OSTREAM || defined _STLP_OSTREAM
 		typedef std::ostream tostream;
 #   endif //_OSTREAM_
-#   if defined _ISTREAM_ || defined _GLIBCXX_ISTREAM
+#   if defined _ISTREAM_ || defined _GLIBCXX_ISTREAM || defined _STLP_ISTREAM || defined _STLP_ISTREAM
 		typedef std::istream tistream;
 #   endif //_ISTREAM_
-#   if defined _OSTREAM_ || defined _CPP_OSTREAM || defined _GLIBCXX_OSTREAM
-#   if defined _ISTREAM_ || defined _CPP_ISTREAM || defined _GLIBCXX_ISTREAM
+#   if defined _OSTREAM_ || defined _CPP_OSTREAM || defined _GLIBCXX_OSTREAM || defined _STLP_OSTREAM
+#   if defined _ISTREAM_ || defined _CPP_ISTREAM || defined _GLIBCXX_ISTREAM || defined _STLP_ISTREAM
 		typedef std::iostream tiostream;
 #   endif //_ISTREAM_
 #   endif //_OSTREAM_
-#   if defined _IOSFWD_ || defined _FSTREAM_ || defined _CPP_FSTREAM || defined _GLIBCXX_FSTREAM
+#   if defined _IOSFWD_ || defined _FSTREAM_ || defined _CPP_FSTREAM || defined _GLIBCXX_FSTREAM || defined _STLP_FSTREAM
 		typedef std::filebuf tfilebuf;
 		typedef std::fstream tfstream;
 		typedef std::ifstream tifstream;