[Mockpp-commits] mockpp/mockpp ReturnObjectList.h,1.32,1.33 ThrowableList.h,1.22,1.23 mockpp.h,1.59,1.60

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

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

Modified Files:
	ReturnObjectList.h ThrowableList.h mockpp.h 
Log Message:
prepare use of alternative stl

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- mockpp.h	26 Nov 2005 18:27:30 -0000	1.59
+++ mockpp.h	26 Nov 2005 20:16:55 -0000	1.60
@@ -152,6 +152,7 @@
 //# define _GLIBCPP_HAVE_WCHAR_H
 #endif
 
+
 #ifdef MOCKPP_USE_MINI_STL
 
 #include <ministl/string>
@@ -162,8 +163,8 @@
 #define MOCKPP_FUNCTION_H  <ministl/function>
 #define MOCKPP_DEQUE_H     <ministl/deque>
 
-// no namespace ministl
-#define MOCKPP_STL
+// namespace ministl
+#define MOCKPP_STL ministl
 
 #else
 
@@ -231,7 +232,7 @@
 //! Output char values more readable (e.g. non-alphanumeric as number)
 #define MOCKPP_MAKE_CHAR_READABLE 1
 
-//! mockpp::Exception is derived from MOCKPP_STL::exception
+//! mockpp::Exception is derived from std::exception
 #define MOCKPP_USE_STD_EXCEPTION 1
 
 #undef HAVE_MULTITHREAD  // obsolete and error prone
@@ -322,7 +323,7 @@
 #ifdef MOCKPP_UNICODE
 
   typedef MOCKPP_STL::basic_string<wchar_t> String;
-  typedef wchar_t                    Char;
+  typedef wchar_t                           Char;
 //! make the charactor constant of type wchar_t
 # define MOCKPP_CHAR(x)  L##x
 //! make the string literal a wchar_t literal
@@ -330,8 +331,8 @@
 
 #else
 
-  typedef MOCKPP_STL::string  String;
-  typedef char         Char;
+  typedef MOCKPP_STL::basic_string<char>  String;
+  typedef char                            Char;
 //! make the charactor constant of type char
 # define MOCKPP_CHAR(x)   x
 //! make the string literal a char literal

Index: ThrowableList.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ThrowableList.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ThrowableList.h	26 Nov 2005 18:27:30 -0000	1.22
+++ ThrowableList.h	26 Nov 2005 20:16:55 -0000	1.23
@@ -138,8 +138,8 @@
     ThrowableList (const ThrowableList &);    // forbid
     ThrowableList& operator=(ThrowableList&);
 
-    std::vector<Throwable *>  list;
-    std::vector<Throwable *>  already_used;
+    MOCKPP_STL::vector<Throwable *>  list;
+    MOCKPP_STL::vector<Throwable *>  already_used;
 };
 
 

Index: ReturnObjectList.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ReturnObjectList.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ReturnObjectList.h	26 Nov 2005 18:27:30 -0000	1.32
+++ ReturnObjectList.h	26 Nov 2005 20:16:55 -0000	1.33
@@ -203,9 +203,9 @@
 
   private:
 
-    std::vector<T>  myObjects;
-    bool            haveDefault;
-    T               defaultObject;
+    MOCKPP_STL::vector<T>  myObjects;
+    bool                   haveDefault;
+    T                      defaultObject;
 };