Update of /cvsroot/mockpp/mockpp/mockpp/compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8234/mockpp/compat
Modified Files:
Formatter.cpp
Log Message:
fix macro namespace
Index: Formatter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Formatter.cpp 10 Apr 2005 12:33:52 -0000 1.39
+++ Formatter.cpp 7 May 2005 12:46:19 -0000 1.40
@@ -46,7 +46,7 @@
{
if ( base < 2 || base > 36 )
{
- mockpp::String fmt = i18n( MOCKPP_PCHAR( "Conversion of long to String: base %1 not allowed" ) );
+ mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of long to String: base %1 not allowed" ) );
fmt << number( ( unsigned long ) base, 10 );
throw mockpp::AssertionFailedError( __LINE__, __FILE__, fmt );
}
@@ -103,7 +103,7 @@
{
if ( base < 2 || base > 36 )
{
- mockpp::String fmt = i18n( MOCKPP_PCHAR( "Conversion of ulong to String: base %1 not allowed" ) );
+ mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of ulong to String: base %1 not allowed" ) );
fmt << number( ( unsigned long ) base, 10 );
throw mockpp::AssertionFailedError( __LINE__, __FILE__, fmt );
}
@@ -213,10 +213,10 @@
text += x;
#else
#if (defined (_MSC_VER) && (_MSC_VER <= 1300)) || (defined (__GNUC__) && (__GNUC__ < 3))
- if (!isalnum(x))
-#else
- if (!std::isalnum(x))
-#endif
+ if (!isalnum(x))
+#else
+ if (!std::isalnum(x))
+#endif
{
text += MOCKPP_PCHAR("0x") + number((unsigned long)x, 16);
}
|
