You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2007/01/24 20:50:02 UTC
svn commit: r499547 -
/logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp
Author: carnold
Date: Wed Jan 24 11:50:01 2007
New Revision: 499547
URL: http://svn.apache.org/viewvc?view=rev&rev=499547
Log:
LOGCXX-169: XMLLayoutTestCase fails on compilers that do not provide location info
Modified:
logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp
Modified: logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp?view=diff&rev=499547&r1=499546&r2=499547
==============================================================================
--- logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp Wed Jan 24 11:50:01 2007
@@ -39,11 +39,11 @@
using namespace log4cxx::helpers;
using namespace log4cxx::xml;
-#ifdef _MSC_VER
-#if _MSC_VER < 1300
+#if defined(__LOG4CXX_FUNC__)
#undef __LOG4CXX_FUNC__
#define __LOG4CXX_FUNC__ "X::X()"
-#endif
+#else
+#error __LOG4CXX_FUNC__ expected to be defined
#endif
class X
@@ -150,12 +150,12 @@
CPPUNIT_ASSERT(Compare::compare(filteredFile, LOG4CXX_FILE("witness/xmlLayout.2")));
}
-#ifdef _MSC_VER
-#if _MSC_VER < 1300
+
+
#undef __LOG4CXX_FUNC__
#define __LOG4CXX_FUNC__ "void XMLLayoutTestCase::testCDATA()"
-#endif
-#endif
+
+
void testCDATA()
{
@@ -301,12 +301,12 @@
CPPUNIT_ASSERT(Compare::compare(filteredFile, LOG4CXX_FILE("witness/xmlLayout.mdc.2")));
}
-#ifdef _MSC_VER
-#if _MSC_VER < 1300
+
+
#undef __LOG4CXX_FUNC__
#define __LOG4CXX_FUNC__ "void XMLLayoutTestCase::common()"
-#endif
-#endif
+
+
void common()
{