[Mockpp-commits] mockpp/mockpp/util AssertMo.cpp,1.17,1.18 AssertMo.h,1.21,1.22 NotImplementedException.cpp,1.16,1.17

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

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

Modified Files:
	AssertMo.cpp AssertMo.h NotImplementedException.cpp 
Log Message:
fixes for cygwin (unicode+ascii)

Index: AssertMo.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- AssertMo.h	28 Jan 2005 20:20:55 -0000	1.21
+++ AssertMo.h	2 Apr 2005 13:46:38 -0000	1.22
@@ -55,6 +55,8 @@
                     const std::string &excludeString,
                     const std::string &targetString);
 
+#ifdef MOCKPP_UNICODE
+
 /** Asserts that a string does not contain a substring. If it does anyway it throws
   * an AssertionFailedError with the given infomation.
   * @ingroup grp_helper
@@ -69,6 +71,8 @@
                     const std::basic_string<wchar_t> &excludeString,
                     const std::basic_string<wchar_t> &targetString);
 
+#endif
+
 /** Asserts that a string does contain a substring. If it does not it throws
   * an AssertionFailedError with the given infomation.
   * @ingroup grp_helper
@@ -83,6 +87,8 @@
                     const std::string &includeString,
                     const std::string &targetString);
 
+#ifdef MOCKPP_UNICODE
+
 /** Asserts that a string does contain a substring. If it does not it throws
   * an AssertionFailedError with the given infomation.
   * @ingroup grp_helper
@@ -97,6 +103,8 @@
                     const std::basic_string<wchar_t> &includeString,
                     const std::basic_string<wchar_t> &targetString);
 
+#endif
+
 /** Asserts that a string starts with a substring. If it does not it throws
   * an AssertionFailedError with the given infomation.
   * @ingroup grp_helper
@@ -111,6 +119,8 @@
                       const std::string &startString,
                       const std::string &targetString);
 
+#ifdef MOCKPP_UNICODE
+
 /** Asserts that a string starts with a substring. If it does not it throws
   * an AssertionFailedError with the given infomation.
   * @ingroup grp_helper
@@ -125,6 +135,8 @@
                       const std::basic_string<wchar_t> &startString,
                       const std::basic_string<wchar_t> &targetString);
 
+#endif
+
 /** Asserts that a verify() of an object fails. If it does not it throws
   * an AssertionFailedError.
   * @ingroup grp_helper

Index: NotImplementedException.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/NotImplementedException.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- NotImplementedException.cpp	24 Mar 2005 20:51:31 -0000	1.16
+++ NotImplementedException.cpp	2 Apr 2005 13:46:38 -0000	1.17
@@ -34,7 +34,7 @@
 
 
 namespace mockpp {
-
+ 
 
 MOCKPP_EXPORT
 NotImplementedException::NotImplementedException(unsigned srcline, const char* srcfile,

Index: AssertMo.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- AssertMo.cpp	30 Dec 2004 20:54:06 -0000	1.17
+++ AssertMo.cpp	2 Apr 2005 13:46:34 -0000	1.18
@@ -49,6 +49,7 @@
   assertTrue(srcline, srcfile, description, targetString.find(excludeString) == String::npos);
 }
 
+#ifdef MOCKPP_UNICODE
 
 void MOCKPP_EXPORT assertExcludes(unsigned srcline, const char* srcfile,
                                   const String &description,
@@ -58,6 +59,7 @@
   assertTrue(srcline, srcfile, description, targetString.find(excludeString) == String::npos);
 }
 
+#endif
 
 void MOCKPP_EXPORT assertIncludes(unsigned srcline, const char* srcfile,
                                   const String &description,
@@ -67,6 +69,7 @@
   assertTrue(srcline, srcfile, description, targetString.find(includeString) != String::npos);
 }
 
+#ifdef MOCKPP_UNICODE
 
 void MOCKPP_EXPORT assertIncludes(unsigned srcline, const char* srcfile,
                                   const String &description,
@@ -76,6 +79,7 @@
   assertTrue(srcline, srcfile, description, targetString.find(includeString) != String::npos);
 }
 
+#endif
 
 void MOCKPP_EXPORT assertStartsWith(unsigned srcline, const char* srcfile,
                                     const String &description,
@@ -86,6 +90,7 @@
 
 }
 
+#ifdef MOCKPP_UNICODE
 
 void MOCKPP_EXPORT assertStartsWith(unsigned srcline, const char* srcfile,
                                     const String &description,
@@ -95,6 +100,7 @@
   assertTrue(srcline, srcfile, description, targetString.find(startString) == 0);
 }
 
+#endif
 
 void MOCKPP_EXPORT assertVerifyFails(unsigned srcline, const char* srcfile,
                                      Verifiable *aVerifiable)