[Mockpp-commits] mockpp/mockpp/util AssertMo.cpp,1.19,1.20 AssertMo.h,1.23,1.24
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/util AssertMo.cpp,1.19,1.20 AssertMo.h,1.23,1.24
|
From: Ewald A. <ewa...@us...> - 2005-11-26 18:00:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21172/mockpp/util Modified Files: AssertMo.cpp AssertMo.h Log Message: prepare use of alternative stl Index: AssertMo.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- AssertMo.h 11 Oct 2005 18:40:40 -0000 1.23 +++ AssertMo.h 26 Nov 2005 18:00:17 -0000 1.24 @@ -52,8 +52,8 @@ */ void assertExcludes(unsigned srcline, const char* srcfile, const String &description, - const std::string &excludeString, - const std::string &targetString); + const MOCKPP_STL::string &excludeString, + const MOCKPP_STL::string &targetString); #ifdef MOCKPP_UNICODE @@ -68,8 +68,8 @@ */ void assertExcludes(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &excludeString, - const std::basic_string<wchar_t> &targetString); + const MOCKPP_STL::basic_string<wchar_t> &excludeString, + const MOCKPP_STL::basic_string<wchar_t> &targetString); #endif @@ -84,8 +84,8 @@ */ void assertIncludes(unsigned srcline, const char* srcfile, const String &description, - const std::string &includeString, - const std::string &targetString); + const MOCKPP_STL::string &includeString, + const MOCKPP_STL::string &targetString); #ifdef MOCKPP_UNICODE @@ -100,8 +100,8 @@ */ void assertIncludes(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &includeString, - const std::basic_string<wchar_t> &targetString); + const MOCKPP_STL::basic_string<wchar_t> &includeString, + const MOCKPP_STL::basic_string<wchar_t> &targetString); #endif @@ -116,8 +116,8 @@ */ void assertStartsWith(unsigned srcline, const char* srcfile, const String &description, - const std::string &startString, - const std::string &targetString); + const MOCKPP_STL::string &startString, + const MOCKPP_STL::string &targetString); #ifdef MOCKPP_UNICODE @@ -132,8 +132,8 @@ */ void assertStartsWith(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &startString, - const std::basic_string<wchar_t> &targetString); + const MOCKPP_STL::basic_string<wchar_t> &startString, + const MOCKPP_STL::basic_string<wchar_t> &targetString); #endif @@ -241,8 +241,8 @@ * \code * MOCKPP_ASSERT_THROWING(object.call(), * "default response", - * std::string, - * std::string("throw default")); + * MOCKPP_STL::string, + * MOCKPP_STL::string("throw default")); * \endcode * @ingroup grp_helper * @param action C++-statement to execute and which is expected to throw @@ -274,8 +274,8 @@ * \code * MOCKPP_ASSERT_THROWING_COND(object.call(), * "default response", - * std::string, - * exception_object.find("throw default") != std::string::npos); + * MOCKPP_STL::string, + * exception_object.find("throw default") != MOCKPP_STL::string::npos); * \endcode * @ingroup grp_helper * @param action C++-statement to execute and throw Index: AssertMo.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- AssertMo.cpp 7 May 2005 12:45:09 -0000 1.19 +++ AssertMo.cpp 26 Nov 2005 18:00:17 -0000 1.20 @@ -43,8 +43,8 @@ void MOCKPP_EXPORT assertExcludes(unsigned srcline, const char* srcfile, const String &description, - const std::string &excludeString, - const std::string &targetString) + const MOCKPP_STL::string &excludeString, + const MOCKPP_STL::string &targetString) { assertTrue(srcline, srcfile, description, targetString.find(excludeString) == String::npos); } @@ -53,8 +53,8 @@ void MOCKPP_EXPORT assertExcludes(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &excludeString, - const std::basic_string<wchar_t> &targetString) + const MOCKPP_STL::basic_string<wchar_t> &excludeString, + const MOCKPP_STL::basic_string<wchar_t> &targetString) { assertTrue(srcline, srcfile, description, targetString.find(excludeString) == String::npos); } @@ -63,8 +63,8 @@ void MOCKPP_EXPORT assertIncludes(unsigned srcline, const char* srcfile, const String &description, - const std::string &includeString, - const std::string &targetString) + const MOCKPP_STL::string &includeString, + const MOCKPP_STL::string &targetString) { assertTrue(srcline, srcfile, description, targetString.find(includeString) != String::npos); } @@ -73,8 +73,8 @@ void MOCKPP_EXPORT assertIncludes(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &includeString, - const std::basic_string<wchar_t> &targetString) + const MOCKPP_STL::basic_string<wchar_t> &includeString, + const MOCKPP_STL::basic_string<wchar_t> &targetString) { assertTrue(srcline, srcfile, description, targetString.find(includeString) != String::npos); } @@ -83,8 +83,8 @@ void MOCKPP_EXPORT assertStartsWith(unsigned srcline, const char* srcfile, const String &description, - const std::string &startString, - const std::string &targetString) + const MOCKPP_STL::string &startString, + const MOCKPP_STL::string &targetString) { assertTrue(srcline, srcfile, description, targetString.find(startString) == 0); @@ -94,8 +94,8 @@ void MOCKPP_EXPORT assertStartsWith(unsigned srcline, const char* srcfile, const String &description, - const std::basic_string<wchar_t> &startString, - const std::basic_string<wchar_t> &targetString) + const MOCKPP_STL::basic_string<wchar_t> &startString, + const MOCKPP_STL::basic_string<wchar_t> &targetString) { assertTrue(srcline, srcfile, description, targetString.find(startString) == 0); } |
