[Mockpp-commits] mockpp/mockpp/compat Formatter.h,1.31,1.32

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

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

Modified Files:
	Formatter.h 
Log Message:
move to mockpp namespace

Index: Formatter.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Formatter.h	24 Jul 2005 17:48:33 -0000	1.31
+++ Formatter.h	24 Jul 2005 18:58:38 -0000	1.32
@@ -312,6 +312,8 @@
 #include <sstream>
 
 
+namespace mockpp {
+
 template <class T>
 mockpp::String ostreamed(const T& t)
 {
@@ -324,6 +326,7 @@
 #endif
 }
 
+}
 
 /** Outputter which reuses an existing operator<<(std::basic_ostream<char>&, T).
   * @param  T  data type for output
@@ -331,13 +334,15 @@
 #define MOCKPP_OSTREAMABLE(T) \
 mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \
 { \
-  formatter << ostreamed(o); \
+  formatter << mockpp::ostreamed(o); \
   return formatter; \
 }
 
 
 #ifdef MOCKPP_UNICODE
 
+namespace mockpp {
+
 template <class T>
 mockpp::String owstreamed(const T& t)
 {
@@ -346,6 +351,7 @@
   return oss.str();
 }
 
+}
 
 /** Outputter which reuses an existing operator<<(std::basic_ostream<wchar_t>&, T).
   * @param  T  data type for output
@@ -353,7 +359,7 @@
 #define MOCKPP_OWSTREAMABLE(T) \
 mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \
 { \
-  formatter <<  owstreamed(o); \
+  formatter <<  mockpp::owstreamed(o); \
   return formatter; \
 }