svn commit: r643957 - in /incubator/qpid/trunk/qpid/cpp/src: qpid/sys/posix/Thread.h tests/logging.cpp

[aconway]

Author: aconway
Date: Wed Apr  2 09:13:54 2008
New Revision: 643957

URL: http://svn.apache.org/viewvc?rev=643957&view=rev
Log:
Fixed logger warning on F9.

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.h
    incubator/qpid/trunk/qpid/cpp/src/tests/logging.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.h
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.h?rev=643957&r1=643956&r2=643957&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.h Wed Apr  2 
09:13:54 2008
@@ -38,7 +38,7 @@
     /** ID of current thread for logging.
      * Workaround for broken Thread::current() in APR
      */
-    static long logId() { return current().id(); }
+    static unsigned long logId() { return current().id(); }
 
     inline static void yield();
 
@@ -48,7 +48,7 @@
     
     inline void join();
 
-    inline long id();
+    inline unsigned long id();
         
   private:
     static void* runRunnable(void* runnable);
@@ -72,8 +72,8 @@
         QPID_POSIX_ASSERT_THROW_IF(pthread_join(thread, 0));
 }
 
-long Thread::id() {
-    return long(thread);
+unsigned long Thread::id() {
+    return thread;
 }
 
 Thread::Thread(pthread_t thr) : thread(thr) {}

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/logging.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/logging.cpp?rev=643957&r1=643956&r2=643957&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/logging.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/logging.cpp Wed Apr  2 09:13:54 2008
@@ -172,7 +172,7 @@
 
     l.format(~0);               // Everything
     QPID_LOG(critical, "foo");
-    string re=".* critical \\[[0-9a-f]*] "+string(__FILE__)+":\\d+:void 
.*testLoggerFormat.*\\(\\): foo\n";
+    string re=".* critical -?\\[[0-9a-f]*] "+string(__FILE__)+":\\d+:void 
.*testLoggerFormat.*\\(\\): foo\n";
     BOOST_CHECK_REGEX(re, out->last());
 }