[prev in list] [next in list] [prev in thread] [next in thread] 

List:       log4cxx-dev
Subject:    svn commit: r580651 - in /logging/log4cxx/trunk/src:
From:       carnold () apache ! org
Date:       2007-09-29 22:04:26
Message-ID: 20070929220427.4ED1C1A9832 () eris ! apache ! org
[Download RAW message or body]

Author: carnold
Date: Sat Sep 29 15:04:25 2007
New Revision: 580651

URL: http://svn.apache.org/viewvc?rev=580651&view=rev
Log:
LOGCXX-129: Windows build fixes for async rewrite

Modified:
    logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
    logging/log4cxx/trunk/src/main/include/log4cxx/helpers/synchronized.h
    logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp

Modified: logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp?rev=580651&r1=580650&r2=580651&view=diff
 ==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp Sat Sep 29 15:04:25 2007
@@ -167,9 +167,9 @@
     
     try {
         dispatcher.join();
-    } catch(InterruptedException& e) {
+	} catch(InterruptedException& e) {
         Thread::currentThreadInterrupt();
-        LogLog::error("Got an InterruptedException while waiting for the dispatcher \
to finish,", e); +        LogLog::error(LOG4CXX_STR("Got an InterruptedException \
while waiting for the dispatcher to finish,"), e);  }
     
     {

Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/synchronized.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/synchronized.h?rev=580651&r1=580650&r2=580651&view=diff
 ==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/synchronized.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/synchronized.h Sat Sep 29 \
15:04:25 2007 @@ -25,7 +25,7 @@
                 class Mutex;
 
                 /** utility class for objects multi-thread synchronization.*/
-                class synchronized
+                class LOG4CXX_EXPORT synchronized
                 {
                 public:
                 synchronized(const Mutex& mutex);

Modified: logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp?rev=580651&r1=580650&r2=580651&view=diff
 ==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp Sat Sep 29 15:04:25 \
2007 @@ -247,8 +247,8 @@
         const std::vector<spi::LoggingEventPtr>& events = \
blockableAppender->getVector();  LoggingEventPtr initialEvent = events[0];
         LoggingEventPtr discardEvent = events[events.size() - 1];
-        CPPUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("Hello, World")), \
                initialEvent->getMessage());
-        CPPUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("Discarded ")), \
discardEvent->getMessage().substr(0,10)); \
+		CPPUNIT_ASSERT(initialEvent->getMessage() == LOG4CXX_STR("Hello, World")); \
+		CPPUNIT_ASSERT(discardEvent->getMessage().substr(0,10) == LOG4CXX_STR("Discarded \
                "));
         CPPUNIT_ASSERT_EQUAL(log4cxx::spi::LocationInfo::getLocationUnavailable().getClassName(), \
  discardEvent->getLocationInformation().getClassName()); 
     }

Modified: logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp?rev=580651&r1=580650&r2=580651&view=diff
 ==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp Sat Sep 29 15:04:25 2007
@@ -56,7 +56,7 @@
      * Tests Level.TRACE.
      */
   void testTrace() {
-      CPPUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("TRACE")), \
Level::getTrace()->toString()); +      CPPUNIT_ASSERT(Level::getTrace()->toString() \
== LOG4CXX_STR("TRACE"));  CPPUNIT_ASSERT_EQUAL(5000, Level::getTrace()->toInt());
       CPPUNIT_ASSERT_EQUAL(7, Level::getTrace()->getSyslogEquivalent());
   }
@@ -66,7 +66,7 @@
      */
   void testIntToTrace() {
       LevelPtr trace(Level::toLevel(5000));
-      CPPUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("TRACE")), trace->toString());
+      CPPUNIT_ASSERT(trace->toString() == LOG4CXX_STR("TRACE"));
   }
 
     /**
@@ -74,7 +74,7 @@
      */
   void testStringToTrace() {
         LevelPtr trace(Level::toLevel("TRACE"));
-        CPPUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("TRACE")), trace->toString());
+		CPPUNIT_ASSERT(trace->toString() == LOG4CXX_STR("TRACE"));
   }
 
 #if LOG4CXX_HAS_WCHAR_T
@@ -83,7 +83,7 @@
      */
   void testWideStringToTrace() {
         LevelPtr trace(Level::toLevel(L"TRACE"));
-        CPPUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("TRACE")), trace->toString());
+        CPPUNIT_ASSERT(trace->toString() == LOG4CXX_STR("TRACE"));
   }
 #endif  
         

Modified: logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp?rev=580651&r1=580650&r2=580651&view=diff
 ==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp Sat Sep 29 15:04:25 2007
@@ -130,7 +130,7 @@
           LOG4CXX_INFO(root, '[' << std::fixed << std::setprecision(2) << \
std::setw(7) << std::right << std::setfill('_') << 10.0 << ']');  \
spi::LoggingEventPtr event(vectorAppender->getVector()[0]);  LogString \
                msg(event->getMessage());
-          CPPUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("[__10.00]")), msg);
+          CPPUNIT_ASSERT(msg == LOG4CXX_STR("[__10.00]"));
        }
 
 #if LOG4CXX_HAS_WCHAR_T
@@ -151,7 +151,7 @@
           LOG4CXX_INFO(root, L'[' << std::fixed << std::setprecision(2) << \
std::setw(7) << std::right << std::setfill(L'_') << 10.0 << L']');  \
spi::LoggingEventPtr event(vectorAppender->getVector()[0]);  LogString \
                msg(event->getMessage());
-          CPPUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("[__10.00]")), msg);
+          CPPUNIT_ASSERT(msg == LOG4CXX_STR("[__10.00]"));
        }
 #endif
 };


[prev in list] [next in list] [prev in thread] [next in thread]