svn commit: r1566349 - in /incubator/log4cxx/trunk/src: changes/changes.xml test/cpp/streamtestcase.cpp

[tschoening]

Author: tschoening
Date: Sun Feb  9 18:49:08 2014
New Revision: 1566349

URL: http://svn.apache.org/r1566349
Log:
LOGCXX-336: Test compilation fails: Overloading ambiguity

Modified:
    incubator/log4cxx/trunk/src/changes/changes.xml
    incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp

Modified: incubator/log4cxx/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/changes/changes.xml?rev=1566349&r1=1566348&r2=1566349&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/changes/changes.xml (original)
+++ incubator/log4cxx/trunk/src/changes/changes.xml Sun Feb  9 18:49:08 2014
@@ -55,6 +55,7 @@
                        <action issue="LOGCXX-304" 
type="fix">BasicConfigurator::configure results in writer not set 
warning.</action>
                        <action issue="LOGCXX-317" type="fix">Log4cxx triggers 
locking inversion which can result in a deadlock.</action>
                        <action issue="LOGCXX-331" 
type="fix">DailyRollingFileAppender should roll if program doesn't run at 
rolling time</action>
+                       <action issue="LOGCXX-336" type="fix">Test compilation 
fails: Overloading ambiguity</action>
                        <action issue="LOGCXX-340" 
type="fix">Transcoder::encodeCharsetName bungles encoding</action>
                        <action issue="LOGCXX-351" type="fix">Download page 
does not have link to KEYS file</action>
                        <action issue="LOGCXX-365" type="fix">Unit tests fail 
on system dates later than 2009-12-31.</action>

Modified: incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp
URL: 
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp?rev=1566349&r1=1566348&r2=1566349&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp (original)
+++ incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp Sun Feb  9 18:49:08 
2014
@@ -224,13 +224,13 @@ public:
        
         void testLogStreamSimple() {
             logstream root(Logger::getRootLogger(), Level::getInfo());
-            root << "This is a test" << LOG4CXX_ENDMSG;
+            root << std::string("This is a test") << LOG4CXX_ENDMSG;
             LOGUNIT_ASSERT_EQUAL((size_t) 1, 
vectorAppender->getVector().size());
         }
 
         void testLogStreamMultiple() {
            logstream root(Logger::getRootLogger(), Level::getInfo());
-           root << "This is a test" << ": Details to follow" << LOG4CXX_ENDMSG;
+           root << std::string("This is a test") << std::string(": Details to 
follow") << LOG4CXX_ENDMSG;
            LOGUNIT_ASSERT_EQUAL((size_t) 1, 
vectorAppender->getVector().size());
        }