[Mockpp-commits] mockpp/mockpp/compat Asserter.cpp,1.2,1.3 Asserter.h,1.2,1.3 AssertionFailedError.c
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/compat Asserter.cpp,1.2,1.3 Asserter.h,1.2,1.3 AssertionFailedError.cpp,1.18,1.19 AssertionFailedError.h,1.14,1.15 Exception.cpp,1.14,1.15 Exception.h,1.19,1.20 Formatter.cpp,1.49,1.50 Formatter.h,1.39,1.40
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/compat Modified Files: Asserter.cpp Asserter.h AssertionFailedError.cpp AssertionFailedError.h Exception.cpp Exception.h Formatter.cpp Formatter.h Log Message: optionally disable mockpp namespace Index: Formatter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- Formatter.h 6 Mar 2006 19:21:34 -0000 1.39 +++ Formatter.h 15 Mar 2006 21:34:02 -0000 1.40 @@ -33,7 +33,7 @@ #include <mockpp/mockpp.h> // always first header -namespace mockpp { +MOCKPP_NS_START /** Converts a long value into its string representation. @@ -42,7 +42,7 @@ * @param base the conversion base from 2 to 36 * @return the resulting string */ - mockpp::String number(long n, unsigned base = 10); + MOCKPP_NS::String number(long n, unsigned base = 10); /** Converts a longlong value into its string representation. * @ingroup grp_helper @@ -50,7 +50,7 @@ * @param base the conversion base from 2 to 36 * @return the resulting string */ - mockpp::String number(long long n, unsigned base = 10); + MOCKPP_NS::String number(long long n, unsigned base = 10); /** Converts an unsigned long value into its string representation. @@ -59,7 +59,7 @@ * @param base the conversion base from 2 to 36 * @return the resulting string */ - mockpp::String number(unsigned long n, unsigned base = 10); + MOCKPP_NS::String number(unsigned long n, unsigned base = 10); /** Converts an unsigned long value into its string representation. @@ -68,7 +68,7 @@ * @param base the conversion base from 2 to 36 * @return the resulting string */ - mockpp::String number(unsigned long long n, unsigned base = 10); + MOCKPP_NS::String number(unsigned long long n, unsigned base = 10); /** Converts an double value into its string representation. @@ -78,7 +78,7 @@ * 0 = minimum required, no trailing zeros. * @return the resulting string */ - mockpp::String number(double n, unsigned prec = 0); + MOCKPP_NS::String number(double n, unsigned prec = 0); /** Replace a positional %-parameter with a value. @@ -92,7 +92,7 @@ String & MOCKPP_EXPORT replaceFormatterString(String &formatter, const String &repdata); -} // namespace mockpp +MOCKPP_NS_END /** Replace a positional %-parameter with a value. @@ -103,7 +103,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const int &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const int &repdata); /** Replace a positional %-parameter with a value. @@ -114,7 +114,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const bool &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const bool &repdata); /** Replace a positional %-parameter with a value. @@ -125,7 +125,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const unsigned int &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const unsigned int &repdata); /** Replace a positional %-parameter with a value. @@ -136,7 +136,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const unsigned long &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const unsigned long &repdata); /** Replace a positional %-parameter with a value. @@ -147,7 +147,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const signed char &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const signed char &repdata); /** Replace a positional %-parameter with a value. @@ -158,7 +158,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const unsigned char &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const unsigned char &repdata); /** Replace a positional %-parameter with a value. @@ -169,7 +169,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const char &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const char &repdata); /** Replace a positional %-parameter with a value. @@ -180,7 +180,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const char * repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const char * repdata); /** Replace a positional %-parameter with a value. @@ -191,7 +191,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const float &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const float &repdata); #ifdef MOCKPP_UNICODE @@ -203,7 +203,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const wchar_t &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const wchar_t &repdata); /** Replace a positional %-parameter with a value. @@ -214,7 +214,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const wchar_t * repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const wchar_t * repdata); #endif // MOCKPP_UNICODE @@ -227,7 +227,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const long &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const long &repdata); /** Replace a positional %-parameter with a value. @@ -238,7 +238,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const mockpp::String &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const MOCKPP_NS::String &repdata); #ifdef MOCKPP_UNICODE @@ -251,7 +251,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const MOCKPP_STL::string &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const MOCKPP_STL::string &repdata); #else // MOCKPP_UNICODE @@ -263,7 +263,7 @@ * @param repdata value to replace * @return the resulting string */ -// mockpp::String & operator << (mockpp::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &repdata); +// MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &repdata); #endif // MOCKPP_UNICODE @@ -276,7 +276,7 @@ * @param repdata value to replace * @return the resulting string */ -mockpp::String & operator << (mockpp::String &formatter, const double &repdata); +MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const double &repdata); #ifdef MOCKPP_ENABLE_DEFAULT_FORMATTER @@ -291,9 +291,9 @@ * @return the resulting string */ template <typename T> -mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) +MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const T &o) { - mockpp::String s = MOCKPP_PCHAR("[") + MOCKPP_NS::String s = MOCKPP_PCHAR("[") #ifdef MOCKPP_NO_RTTI + MOCKPP_GET_STRING("[rtti-disabled]") #else @@ -315,9 +315,9 @@ * @return the resulting string */ template <typename T> -mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T * &po) +MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const T * &po) { - mockpp::String s = MOCKPP_PCHAR("[") + MOCKPP_NS::String s = MOCKPP_PCHAR("[") #ifdef MOCKPP_NO_RTTI + MOCKPP_GET_STRING("[rtti-disabled]") #else @@ -337,15 +337,15 @@ #include <sstream> -namespace mockpp { +MOCKPP_NS_START template <class T> -mockpp::String ostreamed(const T& t) +MOCKPP_NS::String ostreamed(const T& t) { std::basic_ostringstream<char> oss; oss << t; #ifdef MOCKPP_UNICODE - return mockpp::getUnicode(oss.str()); + return MOCKPP_NS::getUnicode(oss.str()); #else #ifdef MOCKPP_ALTERNATIVE_STL return oss.str().c_str(); @@ -355,25 +355,25 @@ #endif } -} +MOCKPP_NS_END /** Outputter which reuses an existing operator<<(std::basic_ostream<char>&, T). * @param T data type for output */ #define MOCKPP_OSTREAMABLE(T) \ -mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \ +MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const T &o) \ { \ - formatter << mockpp::ostreamed(o); \ + formatter << MOCKPP_NS::ostreamed(o); \ return formatter; \ } #ifdef MOCKPP_UNICODE -namespace mockpp { +MOCKPP_NS_START template <class T> -mockpp::String owstreamed(const T& t) +MOCKPP_NS::String owstreamed(const T& t) { std::basic_ostringstream<wchar_t> oss; oss << t; @@ -384,15 +384,15 @@ #endif } -} +MOCKPP_NS_END /** Outputter which reuses an existing operator<<(std::basic_ostream<wchar_t>&, T). * @param T data type for output */ #define MOCKPP_OWSTREAMABLE(T) \ -mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \ +MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const T &o) \ { \ - formatter << mockpp::owstreamed(o); \ + formatter << MOCKPP_NS::owstreamed(o); \ return formatter; \ } Index: Exception.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Exception.h 29 Dec 2005 19:29:50 -0000 1.19 +++ Exception.h 15 Mar 2006 21:34:02 -0000 1.20 @@ -36,7 +36,7 @@ #endif -namespace mockpp { +MOCKPP_NS_START /** Base class for all mockpp exceptions. The main purpose of such exceptions @@ -97,7 +97,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ASSERTIONFAILED_H Index: AssertionFailedError.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- AssertionFailedError.h 29 Dec 2005 19:29:50 -0000 1.14 +++ AssertionFailedError.h 15 Mar 2006 21:34:02 -0000 1.15 @@ -35,7 +35,7 @@ #include <mockpp/compat/Exception.h> -namespace mockpp { +MOCKPP_NS_START /** @@ -77,7 +77,7 @@ const String &message); -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ASSERTIONFAILED_H Index: Asserter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Asserter.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Asserter.cpp 29 Dec 2005 19:29:50 -0000 1.2 +++ Asserter.cpp 15 Mar 2006 21:34:02 -0000 1.3 @@ -66,7 +66,7 @@ #include <mockpp/compat/Asserter.h> -namespace mockpp { +MOCKPP_NS_START void MOCKPP_EXPORT assertTrue(unsigned srcline, const char* srcfile, @@ -219,4 +219,4 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: Exception.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Exception.cpp 29 Dec 2005 19:29:50 -0000 1.14 +++ Exception.cpp 15 Mar 2006 21:34:02 -0000 1.15 @@ -32,7 +32,7 @@ #include <mockpp/compat/Exception.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT Exception::Exception(unsigned line, const char *file, const String &msg) @@ -85,6 +85,6 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- Formatter.cpp 6 Mar 2006 19:21:34 -0000 1.49 +++ Formatter.cpp 15 Mar 2006 21:34:02 -0000 1.50 @@ -38,27 +38,26 @@ #include <mockpp/compat/AssertionFailedError.h> -namespace mockpp -{ +MOCKPP_NS_START #undef MOCKPP_ENABLE_DEFAULT_FORMATTER // one never knows.. -namespace { +MOCKPP_ANON_NS_START template <typename T, typename uT> -mockpp::String MOCKPP_EXPORT number_stpl( T n, unsigned base ) +MOCKPP_NS::String MOCKPP_EXPORT number_stpl( T n, unsigned base ) { if ( base < 2 || base > 36 ) { - mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of T to String: base %1 not allowed" ) ); + MOCKPP_NS::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of T to String: base %1 not allowed" ) ); fmt << number( ( uT ) base, 10 ); - mockpp::assertionFailed( __LINE__, __FILE__, fmt ); + MOCKPP_NS::assertionFailed( __LINE__, __FILE__, fmt ); } - mockpp::Char charbuf[ sizeof(T) * 65 * sizeof( mockpp::Char ) ]; - mockpp::Char *buf = ( mockpp::Char* ) charbuf; - mockpp::Char *p = &buf[ sizeof(T) * 64 ]; + MOCKPP_NS::Char charbuf[ sizeof(T) * 65 * sizeof( MOCKPP_NS::Char ) ]; + MOCKPP_NS::Char *buf = ( MOCKPP_NS::Char* ) charbuf; + MOCKPP_NS::Char *p = &buf[ sizeof(T) * 64 ]; *p = MOCKPP_CHAR( '\0' ); int len = 0; bool neg; @@ -71,7 +70,7 @@ if ( n == INT_MIN ) #endif { - mockpp::String s1, s2; + MOCKPP_NS::String s1, s2; s1 = number( n / ( T ) base, base ); #if defined(_MSC_VER) && (_MSC_VER <= 1200) s2 = number( ( unsigned T ) ( -( n + ( T ) base ) ) % base, base ); @@ -103,36 +102,36 @@ return p; } -} // anon ns +MOCKPP_NS_END -mockpp::String MOCKPP_EXPORT number( long n, unsigned base ) +MOCKPP_NS::String MOCKPP_EXPORT number( long n, unsigned base ) { return number_stpl<long, unsigned long>(n, base); } -mockpp::String MOCKPP_EXPORT number( long long n, unsigned base ) +MOCKPP_NS::String MOCKPP_EXPORT number( long long n, unsigned base ) { return number_stpl<long long, unsigned long long>(n, base); } -namespace { +MOCKPP_ANON_NS_START template <typename T> -mockpp::String MOCKPP_EXPORT number_utpl(T n, unsigned base ) +MOCKPP_NS::String MOCKPP_EXPORT number_utpl(T n, unsigned base ) { if ( base < 2 || base > 36 ) { - mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of unsigned T to String: base %1 not allowed" ) ); + MOCKPP_NS::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of unsigned T to String: base %1 not allowed" ) ); fmt << number( ( T ) base, 10 ); - mockpp::assertionFailed( __LINE__, __FILE__, fmt ); + MOCKPP_NS::assertionFailed( __LINE__, __FILE__, fmt ); } - mockpp::Char charbuf[ sizeof(T) * 65 * sizeof( mockpp::Char ) ]; - mockpp::Char *buf = ( mockpp::Char* ) charbuf; - mockpp::Char *p = &buf[ sizeof(T) * 64 ]; + MOCKPP_NS::Char charbuf[ sizeof(T) * 65 * sizeof( MOCKPP_NS::Char ) ]; + MOCKPP_NS::Char *buf = ( MOCKPP_NS::Char* ) charbuf; + MOCKPP_NS::Char *p = &buf[ sizeof(T) * 64 ]; int len = 0; *p = MOCKPP_CHAR( '\0' ); do @@ -146,22 +145,22 @@ return p; } -} // anon ns +MOCKPP_NS_END -mockpp::String MOCKPP_EXPORT number( unsigned long n, unsigned base ) +MOCKPP_NS::String MOCKPP_EXPORT number( unsigned long n, unsigned base ) { return number_utpl<unsigned long>(n, base); } -mockpp::String MOCKPP_EXPORT number( unsigned long long n, unsigned base ) +MOCKPP_NS::String MOCKPP_EXPORT number( unsigned long long n, unsigned base ) { return number_utpl<unsigned long long>(n, base); } -mockpp::String MOCKPP_EXPORT number( double n, unsigned prec ) +MOCKPP_NS::String MOCKPP_EXPORT number( double n, unsigned prec ) { if ( prec > 99 ) prec = 99; @@ -192,9 +191,9 @@ #endif #ifdef MOCKPP_UNICODE - return mockpp::getUnicode( buf ); + return MOCKPP_NS::getUnicode( buf ); #else - return mockpp::String( buf ); + return MOCKPP_NS::String( buf ); #endif } @@ -202,14 +201,14 @@ /** Helper function. * @internal */ -static bool findArg( mockpp::String &fmt, int& pos, int& len ) +static bool findArg( MOCKPP_NS::String &fmt, int& pos, int& len ) { - mockpp::Char lowest = 0; + MOCKPP_NS::Char lowest = 0; for ( unsigned int i = 0; i < fmt.length(); i++ ) { if ( fmt[ i ] == MOCKPP_CHAR( '%' ) && i + 1 < fmt.length() ) { - mockpp::Char dig = fmt[ i + 1 ]; + MOCKPP_NS::Char dig = fmt[ i + 1 ]; if ( dig >= MOCKPP_CHAR( '0' ) && dig <= MOCKPP_CHAR( '9' ) ) { if ( !lowest || dig < lowest ) @@ -225,7 +224,7 @@ } -String & MOCKPP_EXPORT replaceFormatterString(mockpp::String &formatter, const String &repdata) +String & MOCKPP_EXPORT replaceFormatterString(MOCKPP_NS::String &formatter, const String &repdata) { int pos, len; @@ -269,17 +268,17 @@ } -} // namespace mockpp +MOCKPP_NS_END -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const int &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const int &repdata ) { - formatter << mockpp::number( ( long ) repdata ); + formatter << MOCKPP_NS::number( ( long ) repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const bool &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const bool &repdata ) { formatter << (repdata ? MOCKPP_PCHAR( "true" ) : MOCKPP_PCHAR( "false" )); @@ -287,109 +286,109 @@ } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned int &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const unsigned int &repdata ) { - formatter << mockpp::number( ( unsigned long ) repdata ); + formatter << MOCKPP_NS::number( ( unsigned long ) repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned long &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const unsigned long &repdata ) { - formatter << mockpp::number( repdata ); + formatter << MOCKPP_NS::number( repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const signed char &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const signed char &repdata ) { - formatter << mockpp::charToReadable(repdata); + formatter << MOCKPP_NS::charToReadable(repdata); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const char &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const char &repdata ) { - formatter << mockpp::charToReadable(repdata); + formatter << MOCKPP_NS::charToReadable(repdata); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned char &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const unsigned char &repdata ) { - formatter << mockpp::charToReadable(repdata); + formatter << MOCKPP_NS::charToReadable(repdata); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const char *repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const char *repdata ) { formatter << MOCKPP_STL::string(repdata); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const float &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const float &repdata ) { - formatter << mockpp::number( repdata ); + formatter << MOCKPP_NS::number( repdata ); return formatter; } #ifdef MOCKPP_UNICODE -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const wchar_t &repdata ) { - formatter << mockpp::charToReadable(repdata); + formatter << MOCKPP_NS::charToReadable(repdata); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t * repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const wchar_t * repdata ) { - formatter << mockpp::String(repdata); + formatter << MOCKPP_NS::String(repdata); return formatter; } #endif -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const long &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const long &repdata ) { - formatter << mockpp::number( repdata ); + formatter << MOCKPP_NS::number( repdata ); return formatter; } -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const double &repdata ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const double &repdata ) { - formatter << mockpp::number( repdata ); + formatter << MOCKPP_NS::number( repdata ); return formatter; } #ifdef MOCKPP_UNICODE -mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const MOCKPP_STL::string &str ) +MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const MOCKPP_STL::string &str ) { - formatter << mockpp::getUnicode( str ); + formatter << MOCKPP_NS::getUnicode( str ); return formatter; } #else -// mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &str) +// MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &str) // { -// formatter << mockpp::getLatin1(str); +// formatter << MOCKPP_NS::getLatin1(str); // return formatter; // } #endif -mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const mockpp::String &repdata) +MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const MOCKPP_NS::String &repdata) { - return mockpp::replaceFormatterString(formatter, repdata); + return MOCKPP_NS::replaceFormatterString(formatter, repdata); } Index: Asserter.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Asserter.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Asserter.h 29 Dec 2005 19:29:50 -0000 1.2 +++ Asserter.h 15 Mar 2006 21:34:02 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/compat/AssertionFailedError.h> -namespace mockpp { +MOCKPP_NS_START /** Asserts that a condition is true. If it isn't it throws @@ -307,7 +307,7 @@ } -} // namespace mockpp +MOCKPP_NS_END /** Asserts that two values are equal. @@ -316,7 +316,7 @@ * @param a first value * @param b second value */ -#define MOCKPP_ASSERT_EQUALS_MESSAGE(msg, a, b) mockpp::assertEquals(__LINE__, __FILE__, msg, a, b) +#define MOCKPP_ASSERT_EQUALS_MESSAGE(msg, a, b) MOCKPP_NS::assertEquals(__LINE__, __FILE__, msg, a, b) /** @def MOCKPP_ASSERT_EQUALS * @ingroup grp_helper @@ -326,7 +326,7 @@ * @param b second value */ -# define MOCKPP_ASSERT_EQUALS(a, b) mockpp::assertEquals(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ +# define MOCKPP_ASSERT_EQUALS(a, b) MOCKPP_NS::assertEquals(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" == ") MOCKPP_PCHAR(#b), a, b) /** Asserts that two values are equal concerning a delta. @@ -336,7 +336,7 @@ * @param b second value * @param delta maximal difference a to b */ -#define MOCKPP_ASSERT_DELTA_MESSAGE(msg, a, b, delta) mockpp::assertDelta(__LINE__, __FILE__, msg, a, b, delta) +#define MOCKPP_ASSERT_DELTA_MESSAGE(msg, a, b, delta) MOCKPP_NS::assertDelta(__LINE__, __FILE__, msg, a, b, delta) /** @def MOCKPP_ASSERT_DELTA * @ingroup grp_helper @@ -347,7 +347,7 @@ * @param delta maximal difference a to b */ -# define MOCKPP_ASSERT_DELTA(a, b, delta) mockpp::assertDelta(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ +# define MOCKPP_ASSERT_DELTA(a, b, delta) MOCKPP_NS::assertDelta(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" +- ") MOCKPP_PCHAR(#delta) \ MOCKPP_PCHAR(" == ") MOCKPP_PCHAR(#b), a, b, delta) @@ -358,7 +358,7 @@ * @param up upper boundary * @param a value */ -#define MOCKPP_ASSERT_BOUNDARY_MESSAGE(msg, lo, up, a) mockpp::assertBoundary(__LINE__, __FILE__, msg, lo, up, a) +#define MOCKPP_ASSERT_BOUNDARY_MESSAGE(msg, lo, up, a) MOCKPP_NS::assertBoundary(__LINE__, __FILE__, msg, lo, up, a) /** @def MOCKPP_ASSERT_BOUNDARY * @ingroup grp_helper @@ -369,7 +369,7 @@ * @param a value */ -# define MOCKPP_ASSERT_BOUNDARY(lo, up, a) mockpp::assertBoundary(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ +# define MOCKPP_ASSERT_BOUNDARY(lo, up, a) MOCKPP_NS::assertBoundary(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \ MOCKPP_PCHAR(#lo) MOCKPP_PCHAR(" < ") MOCKPP_PCHAR(#a) \ MOCKPP_PCHAR(" < ") MOCKPP_PCHAR(#up), lo, up, a) @@ -378,7 +378,7 @@ * @param msg a human readable description about the cause * @param cond boolean condition */ -#define MOCKPP_ASSERT_TRUE_MESSAGE(msg, cond) mockpp::assertTrue(__LINE__, __FILE__, msg, cond) +#define MOCKPP_ASSERT_TRUE_MESSAGE(msg, cond) MOCKPP_NS::assertTrue(__LINE__, __FILE__, msg, cond) /** @def MOCKPP_ASSERT_TRUE * @ingroup grp_helper @@ -387,14 +387,14 @@ * @param cond boolean condition */ -# define MOCKPP_ASSERT_TRUE(cond) mockpp::assertTrue(__LINE__, __FILE__, MOCKPP_PCHAR("!true: ") MOCKPP_PCHAR(#cond), cond) +# define MOCKPP_ASSERT_TRUE(cond) MOCKPP_NS::assertTrue(__LINE__, __FILE__, MOCKPP_PCHAR("!true: ") MOCKPP_PCHAR(#cond), cond) /** Asserts that a condition is false. * @ingroup grp_helper * @param msg a human readable description about the cause * @param cond boolean condition */ -#define MOCKPP_ASSERT_FALSE_MESSAGE(msg, cond) mockpp::assertFalse(__LINE__, __FILE__, msg, cond) +#define MOCKPP_ASSERT_FALSE_MESSAGE(msg, cond) MOCKPP_NS::assertFalse(__LINE__, __FILE__, msg, cond) /** @def MOCKPP_ASSERT_FALSE * @ingroup grp_helper @@ -403,13 +403,13 @@ * @param cond boolean condition */ -# define MOCKPP_ASSERT_FALSE(cond) mockpp::assertFalse(__LINE__, __FILE__, MOCKPP_PCHAR("!false: ") MOCKPP_PCHAR(#cond), cond) +# define MOCKPP_ASSERT_FALSE(cond) MOCKPP_NS::assertFalse(__LINE__, __FILE__, MOCKPP_PCHAR("!false: ") MOCKPP_PCHAR(#cond), cond) /** Unconditionally throws an AssertionFailedError. * @ingroup grp_helper * @param msg a human readable description about the cause */ -#define MOCKPP_FAIL(msg) mockpp::fail(__LINE__, __FILE__, msg) +#define MOCKPP_FAIL(msg) MOCKPP_NS::fail(__LINE__, __FILE__, msg) #endif // MOCKPP_ASSERT_H Index: AssertionFailedError.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- AssertionFailedError.cpp 29 Dec 2005 19:29:50 -0000 1.18 +++ AssertionFailedError.cpp 15 Mar 2006 21:34:02 -0000 1.19 @@ -32,7 +32,7 @@ #include <mockpp/compat/AssertionFailedError.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT @@ -77,7 +77,7 @@ } -} // namespace mockpp +MOCKPP_NS_END |
