[Mockpp-commits] mockpp/mockpp/compat Exception.h,1.15,1.16 Formatter.cpp,1.44,1.45 Formatter.h,1.33,1.34

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20492/mockpp/compat

Modified Files:
	Exception.h Formatter.cpp Formatter.h 
Log Message:


Index: Formatter.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Formatter.h	31 Jul 2005 14:14:08 -0000	1.33
+++ Formatter.h	26 Nov 2005 17:56:44 -0000	1.34
@@ -234,7 +234,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const std::string &repdata);
+mockpp::String & operator << (mockpp::String &formatter, const MOCKPP_STL::string &repdata);
 
 #else // MOCKPP_UNICODE
 
@@ -246,7 +246,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-// mockpp::String & operator << (mockpp::String &formatter, const std::basic_string<wchar_t> &repdata);
+// mockpp::String & operator << (mockpp::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &repdata);
 
 #endif // MOCKPP_UNICODE
 
@@ -279,7 +279,6 @@
                      + MOCKPP_GET_STRING(typeid(o).name())
                      + MOCKPP_PCHAR("&]");
   formatter <<  s;
-  MOCKPP_UNUSED(o);
   return formatter;
 }
 
@@ -299,7 +298,6 @@
                      + MOCKPP_GET_STRING(typeid(*po).name())
                      + MOCKPP_PCHAR("*]");
   formatter <<  s;
-  MOCKPP_UNUSED(o);
   return formatter;
 }
 

Index: Exception.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Exception.h	30 Dec 2004 20:54:04 -0000	1.15
+++ Exception.h	26 Nov 2005 17:56:44 -0000	1.16
@@ -91,7 +91,7 @@
     unsigned     srcline;
     String       srcfile;
 #ifdef MOCKPP_USE_STD_EXCEPTION
-    mutable std::string  what_helper;
+    mutable MOCKPP_STL::string  what_helper;
 #endif
 };
 

Index: Formatter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Formatter.cpp	19 Oct 2005 19:41:57 -0000	1.44
+++ Formatter.cpp	26 Nov 2005 17:56:44 -0000	1.45
@@ -290,7 +290,7 @@
 
 mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const char *repdata )
 {
-  formatter << std::string(repdata);
+  formatter << MOCKPP_STL::string(repdata);
   return formatter;
 }
 
@@ -336,7 +336,7 @@
 
 #ifdef MOCKPP_UNICODE
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const std::string &str )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const MOCKPP_STL::string &str )
 {
   formatter << mockpp::getUnicode( str );
   return formatter;
@@ -344,7 +344,7 @@
 
 #else
 
-// mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const std::basic_string<wchar_t> &str)
+// mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &str)
 // {
 //   formatter << mockpp::getLatin1(str);
 //   return formatter;