activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r498736 [1/2] - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp: ./ src/examples/ src/main/activemq/concurrent/ src/main/activemq/connector/openwire/commands/ src/main/activemq/connector/openwire/marshal/ src/main/activemq/connector/...
Date Mon, 22 Jan 2007 18:14:09 GMT
Author: nmittler
Date: Mon Jan 22 10:14:06 2007
New Revision: 498736

URL: http://svn.apache.org/viewvc?view=rev&rev=498736
Log:
[AMQCPP-40] - removing use of unix, sun, cygwin in preprocessor

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/ThreadPool.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseDataStructure.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSelector.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSessionManager.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/DataOutputStream.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedInputStreamTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedOutputStreamTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/DummyTransport.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/IOTransportTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/ResponseCorrelatorTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapRegistrarTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapTest.h
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/main.cpp

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Mon Jan 22 10:14:06 2007
@@ -41,7 +41,8 @@
 VERSION=$ACTIVEMQ_VERSION
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
+# AM_CONFIG_HEADER(config.h)
 
 # Gives us access to the host_os environment variable
 AC_CANONICAL_HOST
@@ -70,8 +71,8 @@
 AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 
-AC_CHECK_HEADERS([uuid.h])
-AC_CHECK_HEADERS([uuid/uuid.h])
+AC_CHECK_HEADERS([uuid.h uuid/uuid.h], [AC_DEFINE([HAVE_UUID_T], [1], [Define if uuid_t exists.])])
+# AC_CHECK_HEADERS([uuid/uuid.h])
 AC_CHECK_HEADERS([objbase.h])
 AC_CHECK_HEADERS([repcdce.h])
 AC_CHECK_HEADERS([sys/filio.h])
@@ -79,14 +80,17 @@
 AC_CHECK_HEADERS([sys/select.h])
 AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_HEADERS([sys/timeb.h])
+AC_CHECK_HEADERS([pthread.h])
 
 AC_CHECK_FUNCS([ioctl select gettimeofday time ftime])
 
+# AC_CHECK_TYPES([uuid_t],[],[],['uuid/uuid.h'])
+
 AM_PATH_CPPUNIT(1.10.2, cppunit=yes, cppunit=no; AC_MSG_RESULT([no. Unit and Integration tests disabled])) 
 AM_CONDITIONAL(BUILD_CPPUNIT_TESTS, test x$cppunit = xyes)
 
 # Define globals for all platforms
-CXXFLAGS="$CXXFLAGS -fstrict-aliasing -Wstrict-aliasing=2 -W -Wall -D HAVE_ACTIVEMQ_CONFIG"
+CXXFLAGS="$CXXFLAGS -fstrict-aliasing -Wstrict-aliasing=2 -W -Wall"
 
 LIBS="$LIBS"
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/main.cpp Mon Jan 22 10:14:06 2007
@@ -222,7 +222,7 @@
 
     // If something bad happens you see it here as this class is also been
     // registered as an ExceptionListener with the connection.
-    virtual void onException( const CMSException& ex ACTIVEMQ_ATTRIBUTE_UNUSED) {
+    virtual void onException( const CMSException& ex AMQCPP_UNUSED) {
         printf("JMS Exception occured.  Shutting down client.\n");
     }
     
@@ -265,7 +265,7 @@
     }
 };
     
-int main(int argc ACTIVEMQ_ATTRIBUTE_UNUSED, char* argv[] ACTIVEMQ_ATTRIBUTE_UNUSED) {
+int main(int argc AMQCPP_UNUSED, char* argv[] AMQCPP_UNUSED) {
 
     std::cout << "=====================================================\n";    
     std::cout << "Starting the example:" << std::endl;

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp Mon Jan 22 10:14:06 2007
@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 Mutex::Mutex()
 {
-#ifdef AMQCPP_USE_PTHREADS
+#ifdef HAVE_PTHREAD_H
     pthread_mutexattr_t attr;
     pthread_mutexattr_init(&attr);
     pthread_mutex_init(&mutex, &attr);
@@ -42,7 +42,7 @@
     // Unlock the mutex.
     unlock();
   
-#ifdef AMQCPP_USE_PTHREADS
+#ifdef HAVE_PTHREAD_H
     pthread_mutex_destroy(&mutex);
 #else
     DeleteCriticalSection(&mutex);
@@ -58,7 +58,7 @@
     }
     else
     {
-#ifdef AMQCPP_USE_PTHREADS               
+#ifdef HAVE_PTHREAD_H               
         pthread_mutex_lock(&mutex);
 #else
         EnterCriticalSection(&mutex);
@@ -90,11 +90,11 @@
     {         
         lock_owner = 0;
 
-        #ifdef AMQCPP_USE_PTHREADS
-            pthread_mutex_unlock(&mutex);
-        #else
-            LeaveCriticalSection(&mutex);
-        #endif            
+#ifdef HAVE_PTHREAD_H
+        pthread_mutex_unlock(&mutex);
+#else
+        LeaveCriticalSection(&mutex);
+#endif            
     }
 }
   
@@ -126,88 +126,88 @@
     this->lock_count = 0;
     this->lock_owner = 0;
  
-    #ifdef AMQCPP_USE_PTHREADS
-
-        // Create this threads wait event
-        pthread_cond_t waitEvent;
-        pthread_cond_init(&waitEvent, NULL);
-    
-        // Store the event in the queue so that a notify can
-        // call it and wake up the thread.
-        eventQ.push_back(&waitEvent);
+#ifdef HAVE_PTHREAD_H
 
-        int returnValue = 0;
-        if(millisecs != WAIT_INFINITE)
+    // Create this threads wait event
+    pthread_cond_t waitEvent;
+    pthread_cond_init(&waitEvent, NULL);
+
+    // Store the event in the queue so that a notify can
+    // call it and wake up the thread.
+    eventQ.push_back(&waitEvent);
+
+    int returnValue = 0;
+    if(millisecs != WAIT_INFINITE)
+    {
+        timeval now = {0,0};
+        gettimeofday(&now, NULL);
+   
+        timespec wait = {0,0};
+        wait.tv_sec = now.tv_sec + (millisecs / 1000);
+        wait.tv_nsec = (now.tv_usec * 1000) + ((millisecs % 1000) * 1000000);
+   
+        if(wait.tv_nsec > 1000000000)
         {
-            timeval now = {0,0};
-            gettimeofday(&now, NULL);
-       
-            timespec wait = {0,0};
-            wait.tv_sec = now.tv_sec + (millisecs / 1000);
-            wait.tv_nsec = (now.tv_usec * 1000) + ((millisecs % 1000) * 1000000);
-       
-            if(wait.tv_nsec > 1000000000)
-            {
-                wait.tv_sec++;
-                wait.tv_nsec -= 1000000000;
-            }
-
-            returnValue =  pthread_cond_timedwait(&waitEvent, &mutex, &wait);
-        }
-        else
-        {
-            returnValue = pthread_cond_wait(&waitEvent, &mutex);
+            wait.tv_sec++;
+            wait.tv_nsec -= 1000000000;
         }
 
-        // If the wait did not succeed for any reason, remove it
-        // from the queue.
-        if( returnValue != 0 ){
-            std::list<pthread_cond_t*>::iterator iter = eventQ.begin();
-            for( ; iter != eventQ.end(); ++iter ){
-                if( *iter == &waitEvent ){
-                    eventQ.erase(iter);
-                    break;
-                }
+        returnValue =  pthread_cond_timedwait(&waitEvent, &mutex, &wait);
+    }
+    else
+    {
+        returnValue = pthread_cond_wait(&waitEvent, &mutex);
+    }
+
+    // If the wait did not succeed for any reason, remove it
+    // from the queue.
+    if( returnValue != 0 ){
+        std::list<pthread_cond_t*>::iterator iter = eventQ.begin();
+        for( ; iter != eventQ.end(); ++iter ){
+            if( *iter == &waitEvent ){
+                eventQ.erase(iter);
+                break;
             }
         }
-        
-        // Destroy our wait event now, the notify method will have removed it
-        // from the event queue.
-        pthread_cond_destroy(&waitEvent);
+    }
+    
+    // Destroy our wait event now, the notify method will have removed it
+    // from the event queue.
+    pthread_cond_destroy(&waitEvent);
 
-    #else
+#else // !defined(HAVE_PTHREAD_H)
 
-        // Create the event to wait on
-        HANDLE waitEvent = CreateEvent( NULL, false, false, NULL );
-    
-        if(waitEvent == NULL)
-        {
-            throw exceptions::ActiveMQException( 
-                __FILE__, __LINE__,
-                "Mutex::Mutex - Failed Creating Event." );
-        }
+    // Create the event to wait on
+    HANDLE waitEvent = CreateEvent( NULL, false, false, NULL );
+
+    if(waitEvent == NULL)
+    {
+        throw exceptions::ActiveMQException( 
+            __FILE__, __LINE__,
+            "Mutex::Mutex - Failed Creating Event." );
+    }
 
-        eventQ.push_back( waitEvent );
+    eventQ.push_back( waitEvent );
 
-        // Release the Lock
-        LeaveCriticalSection( &mutex );
+    // Release the Lock
+    LeaveCriticalSection( &mutex );
 
-        // Wait for a signal
-        WaitForSingleObject( waitEvent, millisecs );
+    // Wait for a signal
+    WaitForSingleObject( waitEvent, millisecs );
 
-        // Reaquire the Lock
-        EnterCriticalSection( &mutex );
+    // Reaquire the Lock
+    EnterCriticalSection( &mutex );
 
-        // Clean up the event, the notif methods will have
-        // already poped it from the queue.
-        CloseHandle( waitEvent );
+    // Clean up the event, the notif methods will have
+    // already poped it from the queue.
+    CloseHandle( waitEvent );
     
-    #endif
+#endif // !defined(HAVE_PTHREAD_H)
  
     // restore the owner
-        this->lock_owner = lock_owner;
-        this->lock_count = lock_count;
-    }
+    this->lock_owner = lock_owner;
+    this->lock_count = lock_count;
+}
   
 ////////////////////////////////////////////////////////////////////////////////
 void Mutex::notify() throw( exceptions::ActiveMQException )
@@ -221,13 +221,13 @@
 
     if( !eventQ.empty() )
     {
-        #ifdef AMQCPP_USE_PTHREADS
-            pthread_cond_signal( eventQ.front() );
-            eventQ.pop_front();
-        #else
-            SetEvent( eventQ.front() );
-            eventQ.pop_front();
-        #endif
+#ifdef HAVE_PTHREAD_H
+        pthread_cond_signal( eventQ.front() );
+        eventQ.pop_front();
+#else
+        SetEvent( eventQ.front() );
+        eventQ.pop_front();
+#endif
     }
 }
 
@@ -241,22 +241,22 @@
             "Mutex::NotifyAll - Failed, not Lock Owner!" );
     }
  
-    #ifdef AMQCPP_USE_PTHREADS
+#ifdef HAVE_PTHREAD_H
 
-        while(!eventQ.empty())
-        {
-             pthread_cond_signal( eventQ.front() );
-             eventQ.pop_front();
-        }
+    while(!eventQ.empty())
+    {
+         pthread_cond_signal( eventQ.front() );
+         eventQ.pop_front();
+    }
 
-    #else
+#else
 
-        while(!eventQ.empty())
-        {
-             SetEvent( eventQ.front() );
-             eventQ.pop_front();
-        }
+    while(!eventQ.empty())
+    {
+         SetEvent( eventQ.front() );
+         eventQ.pop_front();
+    }
 
-    #endif
+#endif
 }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h Mon Jan 22 10:14:06 2007
@@ -22,25 +22,22 @@
 #include <activemq/concurrent/Synchronizable.h>
 #include <activemq/concurrent/Concurrent.h>
 #include <activemq/concurrent/Thread.h>
+#include <activemq/util/Config.h>
 #include <list>
 
-#if (defined(__unix__) || defined(unix) || defined(MACOSX)) && !defined(USG)
-    #ifndef AMQCPP_USE_PTHREADS
-        #define AMQCPP_USE_PTHREADS
-    #endif
-   
-    #include <pthread.h>
+#ifdef HAVE_SYS_TIME_H
     #include <sys/time.h>
 #endif
 
-#if defined(WIN32) || defined(__CYGWIN__) && !defined AMQCPP_USE_PTHREADS
-   
+#ifdef HAVE_PTHREAD_H
+    #include <pthread.h>
+#else
     #include <windows.h>
    
     #if ( !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0400)
-    #if ( !defined(WINVER) || WINVER < 0x0400)
-        #pragma message ("Unsupported platform, Windows NT 4.0 or later required")
-    #endif
+        #if ( !defined(WINVER) || WINVER < 0x0400)
+            #pragma message ("Unsupported platform, Windows NT 4.0 or later required")
+        #endif
     #endif
 
 #endif
@@ -63,7 +60,7 @@
         /**
          * The mutex object.
          */
-        #ifdef AMQCPP_USE_PTHREADS
+        #ifdef HAVE_PTHREAD_H
             pthread_mutex_t mutex;
 
             std::list<pthread_cond_t*> eventQ;

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.cpp Mon Jan 22 10:14:06 2007
@@ -18,7 +18,7 @@
 #include "Thread.h"
 #include <errno.h>
 
-#ifdef AMQCPP_USE_PTHREADS
+#ifdef HAVE_PTHREAD_H
     #include <errno.h> // EINTR
     extern int errno;
 #else
@@ -61,7 +61,7 @@
             "Thread already started");
     }
     
-#ifdef AMQCPP_USE_PTHREADS
+#ifdef HAVE_PTHREAD_H
     
     ::pthread_attr_init (&attributes);
     ::pthread_attr_setdetachstate (&attributes, PTHREAD_CREATE_JOINABLE);
@@ -100,7 +100,7 @@
     }
     if (!this->joined) {
         
-#ifdef AMQCPP_USE_PTHREADS
+#ifdef HAVE_PTHREAD_H
         ::pthread_join(this->threadHandle, NULL);
 #else
         ::WaitForSingleObject (this->threadHandle, INFINITE);       
@@ -113,7 +113,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 void Thread::sleep( int millisecs )
 {
-#ifdef AMQCPP_USE_PTHREADS
+#ifdef HAVE_PTHREAD_H
     struct timespec rec, rem;
     rec.tv_sec = millisecs / 1000;
     rec.tv_nsec = (millisecs % 1000) * 1000000;
@@ -131,7 +131,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 unsigned long Thread::getId(void)
 {
-   #ifdef AMQCPP_USE_PTHREADS
+   #ifdef HAVE_PTHREAD_H
       return (long)(pthread_self());
    #else
       return GetCurrentThreadId();
@@ -139,10 +139,10 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-#ifdef AMQCPP_USE_PTHREADS
-void*
+#ifdef HAVE_PTHREAD_H
+    void*
 #else
-unsigned int WINAPI
+    unsigned int WINAPI
 #endif
 Thread::runCallback( void* param )
 {
@@ -157,7 +157,7 @@
         ex.printStackTrace();
     }
 
-#ifdef AMQCPP_USE_PTHREADS
+#ifdef HAVE_PTHREAD_H
     ::pthread_attr_destroy( &thread->attributes );
     return NULL;
 #else

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.h Mon Jan 22 10:14:06 2007
@@ -19,15 +19,11 @@
 
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/concurrent/Runnable.h>
+#include <activemq/util/Config.h>
 #include <stdexcept>
 #include <assert.h>
 
-#if (defined(__unix__) || defined(unix) || defined(MACOSX) || defined(__APPLE__)) && !defined(USG)
-   
-    #ifndef AMQCPP_USE_PTHREADS
-        #define AMQCPP_USE_PTHREADS
-    #endif
-
+#ifdef HAVE_PTHREAD_H
     #include <pthread.h>
 #else
     #include <windows.h>
@@ -51,7 +47,7 @@
          */
         Runnable* task;
       
-        #ifdef AMQCPP_USE_PTHREADS
+        #ifdef HAVE_PTHREAD_H
             pthread_attr_t attributes;
             pthread_t threadHandle;
         #else
@@ -125,7 +121,7 @@
     private:
    
         // Internal thread handling
-        #ifdef AMQCPP_USE_PTHREADS
+        #ifdef HAVE_PTHREAD_H
             static void* runCallback (void* param);
         #else
             static unsigned int WINAPI runCallback (void* param);

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/ThreadPool.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/ThreadPool.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/ThreadPool.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/concurrent/ThreadPool.cpp Mon Jan 22 10:14:06 2007
@@ -271,7 +271,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ThreadPool::onTaskStarted( PooledThread* thread ACTIVEMQ_ATTRIBUTE_UNUSED)
+void ThreadPool::onTaskStarted( PooledThread* thread AMQCPP_UNUSED)
 {
     try
     {
@@ -300,7 +300,7 @@
 }
  
 ////////////////////////////////////////////////////////////////////////////////
-void ThreadPool::onTaskCompleted( PooledThread* thread ACTIVEMQ_ATTRIBUTE_UNUSED)
+void ThreadPool::onTaskCompleted( PooledThread* thread AMQCPP_UNUSED)
 {
     try
     {    
@@ -318,7 +318,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 void ThreadPool::onTaskException(
    PooledThread* thread, 
-   exceptions::ActiveMQException& ex ACTIVEMQ_ATTRIBUTE_UNUSED)
+   exceptions::ActiveMQException& ex AMQCPP_UNUSED)
 {
     //LOGCMS_DEBUG(logger, "ThreadPool::onTaskException: ");
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h Mon Jan 22 10:14:06 2007
@@ -301,7 +301,7 @@
          * Sets the Destination for this message
          * @param destination - Destination Object
          */
-        virtual void setCMSDestination( const cms::Destination* destination ACTIVEMQ_ATTRIBUTE_UNUSED) {
+        virtual void setCMSDestination( const cms::Destination* destination AMQCPP_UNUSED) {
  //           this->setDestination( destination );
         }
       
@@ -331,7 +331,7 @@
          * Sets the CMS Message Id for this message
          * @param id - time value
          */
-        virtual void setCMSMessageId( const std::string& id ACTIVEMQ_ATTRIBUTE_UNUSED) {}
+        virtual void setCMSMessageId( const std::string& id AMQCPP_UNUSED) {}
       
         /**
          * Gets the Priority Value for this Message
@@ -361,7 +361,7 @@
          * Sets the Redelivered Flag for this message
          * @param redelivered - boolean redelivered value
          */
-        virtual void setCMSRedelivered( bool redelivered ACTIVEMQ_ATTRIBUTE_UNUSED) {}
+        virtual void setCMSRedelivered( bool redelivered AMQCPP_UNUSED) {}
 
         /**
          * Gets the CMS Reply To Address for this Message

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMapMessage.h Mon Jan 22 10:14:06 2007
@@ -301,7 +301,7 @@
          * Sets the Destination for this message
          * @param destination - Destination Object
          */
-        virtual void setCMSDestination( const cms::Destination* destination ACTIVEMQ_ATTRIBUTE_UNUSED ) {
+        virtual void setCMSDestination( const cms::Destination* destination AMQCPP_UNUSED ) {
 //            this->setDestination( destination );
         }
       
@@ -331,7 +331,7 @@
          * Sets the CMS Message Id for this message
          * @param id - time value
          */
-        virtual void setCMSMessageId( const std::string& id ACTIVEMQ_ATTRIBUTE_UNUSED ) {}
+        virtual void setCMSMessageId( const std::string& id AMQCPP_UNUSED ) {}
       
         /**
          * Gets the Priority Value for this Message
@@ -361,7 +361,7 @@
          * Sets the Redelivered Flag for this message
          * @param redelivered - boolean redelivered value
          */
-        virtual void setCMSRedelivered( bool redelivered ACTIVEMQ_ATTRIBUTE_UNUSED ) {}
+        virtual void setCMSRedelivered( bool redelivered AMQCPP_UNUSED ) {}
 
         /**
          * Gets the CMS Reply To Address for this Message

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessage.cpp Mon Jan 22 10:14:06 2007
@@ -41,7 +41,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ActiveMQMessage::beforeMarshall( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED )
+void ActiveMQMessage::beforeMarshall( OpenWireFormat* wireFormat AMQCPP_UNUSED )
 {
     marshalledProperties.clear();
     if( !properties.isEmpty() )

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.h Mon Jan 22 10:14:06 2007
@@ -301,7 +301,7 @@
          * Sets the Destination for this message
          * @param destination - Destination Object
          */
-        virtual void setCMSDestination( const cms::Destination* destination ACTIVEMQ_ATTRIBUTE_UNUSED ) {
+        virtual void setCMSDestination( const cms::Destination* destination AMQCPP_UNUSED ) {
 //            this->setDestination( 
 //                dynamic_cast<const ActiveMQDestination*>( destination ) );
         }
@@ -332,7 +332,7 @@
          * Sets the CMS Message Id for this message
          * @param id - time value
          */
-        virtual void setCMSMessageId( const std::string& id ACTIVEMQ_ATTRIBUTE_UNUSED ) {}
+        virtual void setCMSMessageId( const std::string& id AMQCPP_UNUSED ) {}
       
         /**
          * Gets the Priority Value for this Message
@@ -362,7 +362,7 @@
          * Sets the Redelivered Flag for this message
          * @param redelivered - boolean redelivered value
          */
-        virtual void setCMSRedelivered( bool redelivered ACTIVEMQ_ATTRIBUTE_UNUSED ) {}
+        virtual void setCMSRedelivered( bool redelivered AMQCPP_UNUSED ) {}
 
         /**
          * Gets the CMS Reply To Address for this Message

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseDataStructure.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseDataStructure.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseDataStructure.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BaseDataStructure.h Mon Jan 22 10:14:06 2007
@@ -49,25 +49,25 @@
          * Perform any processing needed before an marshal
          * @param wireformat - the OpenWireFormat object in use.
          */
-        virtual void beforeMarshall( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED) {}
+        virtual void beforeMarshall( OpenWireFormat* wireFormat AMQCPP_UNUSED) {}
         
         /**
          * Perform any processing needed after an unmarshal
          * @param wireformat - the OpenWireFormat object in use.
          */
-        virtual void afterMarshall( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED) {}
+        virtual void afterMarshall( OpenWireFormat* wireFormat AMQCPP_UNUSED) {}
         
         /**
          * Perform any processing needed before an unmarshal
          * @param wireformat - the OpenWireFormat object in use.
          */
-        virtual void beforeUnmarshall( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED) {}
+        virtual void beforeUnmarshall( OpenWireFormat* wireFormat AMQCPP_UNUSED) {}
         
         /**
          * Perform any processing needed after an unmarshal
          * @param wireformat - the OpenWireFormat object in use.
          */
-        virtual void afterUnmarshall( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED) {}
+        virtual void afterUnmarshall( OpenWireFormat* wireFormat AMQCPP_UNUSED) {}
 
         /**
          * Called to set the data to this object that will contain the objects
@@ -75,8 +75,8 @@
          * @param wireFormat - the wireformat object to control unmarshaling
          * @param data - vector of object binary data
          */ 
-        virtual void setMarshalledForm( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                                        const std::vector<char>& data ACTIVEMQ_ATTRIBUTE_UNUSED) {}
+        virtual void setMarshalledForm( OpenWireFormat* wireFormat AMQCPP_UNUSED, 
+                                        const std::vector<char>& data AMQCPP_UNUSED) {}
 
         /**
          * Called to get the data to this object that will contain the objects
@@ -84,7 +84,7 @@
          * @param wireFormat - the wireformat object to control unmarshaling
          * @return buffer that holds the objects data.
          */ 
-        virtual std::vector<unsigned char> getMarshalledForm( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED) {
+        virtual std::vector<unsigned char> getMarshalledForm( OpenWireFormat* wireFormat AMQCPP_UNUSED) {
             return std::vector<unsigned char>(); 
         }
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/BooleanExpression.h Mon Jan 22 10:14:06 2007
@@ -45,7 +45,7 @@
          * members, overwriting any existing data.
          * @return src - Source Object
          */
-        virtual void copyDataStructure( const DataStructure* src ACTIVEMQ_ATTRIBUTE_UNUSED) {}
+        virtual void copyDataStructure( const DataStructure* src AMQCPP_UNUSED) {}
         
     };
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp Mon Jan 22 10:14:06 2007
@@ -325,7 +325,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int BaseDataStreamMarshaller::tightMarshalLong1( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED, 
+int BaseDataStreamMarshaller::tightMarshalLong1( OpenWireFormat* wireFormat AMQCPP_UNUSED, 
                                                  long long value,
                                                  utils::BooleanStream* bs ) 
                                                     throw ( io::IOException ) {
@@ -367,7 +367,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BaseDataStreamMarshaller::tightMarshalLong2( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED, 
+void BaseDataStreamMarshaller::tightMarshalLong2( OpenWireFormat* wireFormat AMQCPP_UNUSED, 
                                                   long long value, 
                                                   io::DataOutputStream* dataOut, 
                                                   utils::BooleanStream* bs ) 
@@ -396,7 +396,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 long long BaseDataStreamMarshaller::tightUnmarshalLong( 
-    OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED, 
+    OpenWireFormat* wireFormat AMQCPP_UNUSED, 
     io::DataInputStream* dataIn, 
     utils::BooleanStream* bs ) 
         throw ( io::IOException ) {
@@ -425,7 +425,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BaseDataStreamMarshaller::looseMarshalLong( OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED, 
+void BaseDataStreamMarshaller::looseMarshalLong( OpenWireFormat* wireFormat AMQCPP_UNUSED, 
                                                  long long value, 
                                                  io::DataOutputStream* dataOut ) 
                                                     throw ( io::IOException ) {
@@ -440,7 +440,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 long long BaseDataStreamMarshaller::looseUnmarshalLong( 
-    OpenWireFormat* wireFormat ACTIVEMQ_ATTRIBUTE_UNUSED, 
+    OpenWireFormat* wireFormat AMQCPP_UNUSED, 
     io::DataInputStream* dataIn ) 
         throw ( io::IOException ) { 
 
@@ -726,7 +726,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 std::vector<unsigned char> BaseDataStreamMarshaller::tightUnmarshalConstByteArray( 
     io::DataInputStream* dataIn, 
-    utils::BooleanStream* bs ACTIVEMQ_ATTRIBUTE_UNUSED, 
+    utils::BooleanStream* bs AMQCPP_UNUSED, 
     int size ) 
         throw ( io::IOException ) {
          

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp Mon Jan 22 10:14:06 2007
@@ -364,7 +364,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::Topic* StompConnector::createTopic( const std::string& name, 
-                                         SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+                                         SessionInfo* session AMQCPP_UNUSED)
     throw ( ConnectorException )
 {
     try
@@ -379,7 +379,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::Queue* StompConnector::createQueue( const std::string& name, 
-                                         SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+                                         SessionInfo* session AMQCPP_UNUSED)
     throw ( ConnectorException )
 {
     try
@@ -394,7 +394,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::TemporaryTopic* StompConnector::createTemporaryTopic(
-    SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+    SessionInfo* session AMQCPP_UNUSED)
         throw ( ConnectorException )
 {
     try
@@ -410,7 +410,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::TemporaryQueue* StompConnector::createTemporaryQueue(
-    SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+    SessionInfo* session AMQCPP_UNUSED)
         throw ( ConnectorException )
 {
     try
@@ -492,7 +492,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 void StompConnector::acknowledge( const SessionInfo* session,
                                   const cms::Message* message,
-                                  AckType ackType ACTIVEMQ_ATTRIBUTE_UNUSED)
+                                  AckType ackType AMQCPP_UNUSED)
     throw ( ConnectorException )
 {
     try
@@ -560,7 +560,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void StompConnector::commit( TransactionInfo* transaction, 
-                             SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+                             SessionInfo* session AMQCPP_UNUSED)
     throw ( ConnectorException )
 {
     try
@@ -580,7 +580,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void StompConnector::rollback( TransactionInfo* transaction, 
-                               SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+                               SessionInfo* session AMQCPP_UNUSED)
     throw ( ConnectorException )
 {
     try
@@ -600,7 +600,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::Message* StompConnector::createMessage(
-    SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED,
+    SessionInfo* session AMQCPP_UNUSED,
     TransactionInfo* transaction )
         throw ( ConnectorException )
 {
@@ -624,7 +624,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::BytesMessage* StompConnector::createBytesMessage(
-    SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED,
+    SessionInfo* session AMQCPP_UNUSED,
     TransactionInfo* transaction )
         throw ( ConnectorException )
 {
@@ -648,7 +648,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::TextMessage* StompConnector::createTextMessage(
-    SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED,
+    SessionInfo* session AMQCPP_UNUSED,
     TransactionInfo* transaction )
         throw ( ConnectorException )
 {
@@ -672,8 +672,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 cms::MapMessage* StompConnector::createMapMessage(
-    SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED,
-    TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED )
+    SessionInfo* session AMQCPP_UNUSED,
+    TransactionInfo* transaction AMQCPP_UNUSED )
         throw ( ConnectorException )
 {
     try
@@ -688,7 +688,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void StompConnector::unsubscribe( const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED )
+void StompConnector::unsubscribe( const std::string& name AMQCPP_UNUSED )
     throw ( ConnectorException )
 {
     try
@@ -767,7 +767,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void StompConnector::onTransportException( 
-    transport::Transport* source ACTIVEMQ_ATTRIBUTE_UNUSED, 
+    transport::Transport* source AMQCPP_UNUSED, 
     const exceptions::ActiveMQException& ex )
 {
     try

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSelector.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSelector.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSelector.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSelector.cpp Mon Jan 22 10:14:06 2007
@@ -22,8 +22,8 @@
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////
-bool StompSelector::isSelected( const string& selector ACTIVEMQ_ATTRIBUTE_UNUSED,
-    cms::Message* msg ACTIVEMQ_ATTRIBUTE_UNUSED)
+bool StompSelector::isSelected( const string& selector AMQCPP_UNUSED,
+    cms::Message* msg AMQCPP_UNUSED)
 {
     return true;
 }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSessionManager.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSessionManager.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSessionManager.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSessionManager.cpp Mon Jan 22 10:14:06 2007
@@ -110,7 +110,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void StompSessionManager::removeSession( 
-    connector::SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+    connector::SessionInfo* session AMQCPP_UNUSED)
         throw ( exceptions::ActiveMQException )
 {
     // NO-op

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h Mon Jan 22 10:14:06 2007
@@ -159,7 +159,7 @@
          * Set if this Message requires a Response
          * @param required true if response is required
          */
-        virtual void setResponseRequired( const bool required ACTIVEMQ_ATTRIBUTE_UNUSED) {
+        virtual void setResponseRequired( const bool required AMQCPP_UNUSED) {
         }
         
         /**

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/DataOutputStream.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/DataOutputStream.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/DataOutputStream.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/DataOutputStream.cpp Mon Jan 22 10:14:06 2007
@@ -197,7 +197,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void DataOutputStream::writeChars( const std::string& value ACTIVEMQ_ATTRIBUTE_UNUSED) 
+void DataOutputStream::writeChars( const std::string& value AMQCPP_UNUSED) 
 throw ( IOException ) {
     /* do nothing */
 }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp Mon Jan 22 10:14:06 2007
@@ -66,13 +66,13 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Logger* LogManager::getLogger( const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED)
+Logger* LogManager::getLogger( const std::string& name AMQCPP_UNUSED)
 {
     return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int LogManager::getLoggerNames( const std::vector<std::string>& names  ACTIVEMQ_ATTRIBUTE_UNUSED)
+int LogManager::getLoggerNames( const std::vector<std::string>& names  AMQCPP_UNUSED)
 {
     return 0;
 }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp Mon Jan 22 10:14:06 2007
@@ -41,8 +41,8 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void LogWriter::log(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED,
-                    const int          line ACTIVEMQ_ATTRIBUTE_UNUSED,
+void LogWriter::log(const std::string& file AMQCPP_UNUSED,
+                    const int          line AMQCPP_UNUSED,
                     const std::string& prefix,
                     const std::string& message)
 {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp Mon Jan 22 10:14:06 2007
@@ -26,8 +26,8 @@
 using namespace activemq::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
-Logger::Logger( const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                Logger* parent ACTIVEMQ_ATTRIBUTE_UNUSED )
+Logger::Logger( const std::string& name AMQCPP_UNUSED, 
+                Logger* parent AMQCPP_UNUSED )
 {
 }
 
@@ -67,100 +67,100 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::setFilter( Filter* filter ACTIVEMQ_ATTRIBUTE_UNUSED )
+void Logger::setFilter( Filter* filter AMQCPP_UNUSED )
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Logger::isLoggable( Level level ACTIVEMQ_ATTRIBUTE_UNUSED ) const
+bool Logger::isLoggable( Level level AMQCPP_UNUSED ) const
 {
     return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::entry(const std::string& blockName ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const int line ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::entry(const std::string& blockName AMQCPP_UNUSED, 
+                   const std::string& file AMQCPP_UNUSED, 
+                   const int line AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::exit(const std::string& blockName ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const int line ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::exit(const std::string& blockName AMQCPP_UNUSED, 
+                  const std::string& file AMQCPP_UNUSED, 
+                  const int line AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::debug(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const int line ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::debug(const std::string& file AMQCPP_UNUSED, 
+                   const int line AMQCPP_UNUSED, 
+                   const std::string fnctionName AMQCPP_UNUSED, 
+                   const std::string& message AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::info(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const int line ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::info(const std::string& file AMQCPP_UNUSED, 
+                  const int line AMQCPP_UNUSED, 
+                  const std::string fnctionName AMQCPP_UNUSED, 
+                  const std::string& message AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::error(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const int line ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED,
-                   const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::error(const std::string& file AMQCPP_UNUSED, 
+                   const int line AMQCPP_UNUSED, 
+                   const std::string fnctionName AMQCPP_UNUSED,
+                   const std::string& message AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::warn(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const int line ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::warn(const std::string& file AMQCPP_UNUSED, 
+                  const int line AMQCPP_UNUSED, 
+                  const std::string fnctionName AMQCPP_UNUSED, 
+                  const std::string& message AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::fatal(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const int line ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                   const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::fatal(const std::string& file AMQCPP_UNUSED, 
+                   const int line AMQCPP_UNUSED, 
+                   const std::string fnctionName AMQCPP_UNUSED, 
+                   const std::string& message AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::log( Level level ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                  const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::log( Level level AMQCPP_UNUSED, 
+                  const std::string& message AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::log(Level level ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                 const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                 const int line ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                 const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                 cms::CMSException& ex ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::log(Level level AMQCPP_UNUSED, 
+                 const std::string& file AMQCPP_UNUSED, 
+                 const int line AMQCPP_UNUSED, 
+                 const std::string& message AMQCPP_UNUSED, 
+                 cms::CMSException& ex AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::log(Level level ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                 const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                 const int line ACTIVEMQ_ATTRIBUTE_UNUSED, 
-                 const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED, ...)
+void Logger::log(Level level AMQCPP_UNUSED, 
+                 const std::string& file AMQCPP_UNUSED, 
+                 const int line AMQCPP_UNUSED, 
+                 const std::string& message AMQCPP_UNUSED, ...)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Logger::log(LogRecord& record ACTIVEMQ_ATTRIBUTE_UNUSED)
+void Logger::log(LogRecord& record AMQCPP_UNUSED)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Logger* Logger::getLogger(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED)
+Logger* Logger::getLogger(const std::string& name AMQCPP_UNUSED)
 {
     return NULL;
 }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp Mon Jan 22 10:14:06 2007
@@ -16,9 +16,17 @@
  */
 
 #include "ServerSocket.h"
-#include <activemq/util/Config.h>
 
-#if !defined(HAVE_WINSOCK2_H)
+#ifdef HAVE_WINSOCK2_H
+    #include <Winsock2.h>
+    #include <Ws2tcpip.h> 
+    #include <sys/stat.h>
+    #define stat _stat
+    #ifdef errno
+    #undef errno
+    #endif
+    int errno;
+#else
     #include <unistd.h>
     #include <netdb.h>
     #include <fcntl.h>
@@ -28,15 +36,6 @@
     #include <arpa/inet.h>
     #include <string.h>
     extern int errno;
-#else
-    #include <Winsock2.h>
-    #include <Ws2tcpip.h> 
-    #include <sys/stat.h>
-    #define stat _stat
-    #ifdef errno
-    #undef errno
-    #endif
-    int errno;
 #endif
 
 #include <stdio.h>
@@ -51,7 +50,7 @@
 
 using namespace activemq::network;
 
-#if defined(HAVE_WINSOCK2_H)
+#ifdef HAVE_WINSOCK2_H
 
     // Static socket initializer needed for winsock
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.h Mon Jan 22 10:14:06 2007
@@ -19,6 +19,7 @@
 
 #include <activemq/network/TcpSocket.h>
 #include <activemq/network/SocketException.h>
+#include <activemq/util/Config.h>
 
 namespace activemq{
 namespace network{
@@ -85,7 +86,7 @@
        
    protected:
 
-      #if !defined( unix ) || defined( __CYGWIN__ )
+      #ifdef HAVE_WINSOCK2_H
       
           // WINDOWS needs initialization of winsock
           class StaticServerSocketInitializer {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp Mon Jan 22 10:14:06 2007
@@ -187,7 +187,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int SocketInputStream::skip( int num ACTIVEMQ_ATTRIBUTE_UNUSED ) 
+int SocketInputStream::skip( int num AMQCPP_UNUSED ) 
 throw ( io::IOException, exceptions::UnsupportedOperationException ) {
     throw exceptions::UnsupportedOperationException(__FILE__, __LINE__, 
         "skip() method is not supported"); 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp Mon Jan 22 10:14:06 2007
@@ -18,23 +18,27 @@
 #include "SocketOutputStream.h"
 #include <activemq/util/Config.h>
 
-#if !defined(HAVE_WINSOCK2_H)
+#ifdef HAVE_WINSOCK2_H
+    #include <Winsock2.h>
+#else
     #include <sys/socket.h>
     extern int errno;
-#else
-    #include <Winsock2.h>
 #endif
 
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#if defined( __APPLE__ )
-#define SOCKET_NOSIGNAL SO_NOSIGPIPE
-#elif defined( unix ) && !defined( __CYGWIN__ ) && !defined( sun )
-#define SOCKET_NOSIGNAL MSG_NOSIGNAL
-#else
-#define SOCKET_NOSIGNAL 0
+#if !defined(SOCKET_NOSIGNAL)
+
+    #if defined(SO_NOSIGPIPE)
+        #define SOCKET_NOSIGNAL SO_NOSIGPIPE
+    #elif defined(MSG_NOSIGNAL)
+        #define SOCKET_NOSIGNAL MSG_NOSIGNAL
+    #else
+        #define SOCKET_NOSIGNAL 0
+    #endif
+
 #endif
 
 using namespace activemq::network;

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp Mon Jan 22 10:14:06 2007
@@ -179,7 +179,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Response* IOTransport::request( Command* command ACTIVEMQ_ATTRIBUTE_UNUSED ) 
+Response* IOTransport::request( Command* command AMQCPP_UNUSED ) 
 throw( CommandIOException, exceptions::UnsupportedOperationException ){
     throw exceptions::UnsupportedOperationException( __FILE__, __LINE__, "IOTransport::request() - unsupported operation" );
 }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp Mon Jan 22 10:14:06 2007
@@ -22,7 +22,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 Transport* IOTransportFactory::createTransport( 
-    const activemq::util::Properties& properties ACTIVEMQ_ATTRIBUTE_UNUSED )
+    const activemq::util::Properties& properties AMQCPP_UNUSED )
 {
     return new IOTransport();
 }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp Mon Jan 22 10:14:06 2007
@@ -41,12 +41,12 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 TransportFactoryMap::TransportFactoryMap( 
-const TransportFactoryMap& factoryMap ACTIVEMQ_ATTRIBUTE_UNUSED ){
+const TransportFactoryMap& factoryMap AMQCPP_UNUSED ){
 }
       
 ////////////////////////////////////////////////////////////////////////////////
 TransportFactoryMap& TransportFactoryMap::operator=( 
-const TransportFactoryMap& factoryMap ACTIVEMQ_ATTRIBUTE_UNUSED ){ 
+const TransportFactoryMap& factoryMap AMQCPP_UNUSED ){ 
     return *this;
 }
 ////////////////////////////////////////////////////////////////////////////////

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.cpp Mon Jan 22 10:14:06 2007
@@ -23,7 +23,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void TransportFilter::onTransportException( 
-    Transport* source ACTIVEMQ_ATTRIBUTE_UNUSED, 
+    Transport* source AMQCPP_UNUSED, 
     const exceptions::ActiveMQException& ex )
 {
     fire( ex );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h Mon Jan 22 10:14:06 2007
@@ -22,38 +22,38 @@
 // of the platform when the ./configure script is not being used to generate
 // the config.h file.
 //
-#if defined(HAVE_ACTIVEMQ_CONFIG) 
+#if defined(HAVE_CONFIG_H) 
 
 	// config.h is generated by the ./configure script and it only 
 	// used by unix like systems (including cygwin)
 	#include <config.h>
 
-
-#else /* !defined(HAVE_ACTIVEMQ_CONFIG) */
+#else /* !defined(HAVE_CONFIG_H) */
 
 	// Not using ./configure script and make system.. chances are your using the native build tools
 	// of Windows or OS X to do this build
     
-	#if defined(_WIN32) || defined( __CYGWIN__ )
+	#if defined(_WIN32)
 		#define HAVE_OBJBASE_H
 		#define HAVE_RPCDCE_H
 		#define HAVE_WINSOCK2_H
         #define HAVE_STRUCT_ADDRINFO
         #define HAVE_SYS_TIMEB_H
         #define HAVE_FTIME
-	#elif defined(unix) || defined(__unix__) || defined(__APPLE__)
-		#define HAVE_UUID_UUID_H
+        #define HAVE_WINDOWS_H
 	#else
-		#error "Unknown Platform"
+		#define HAVE_UUID_UUID_H
+        #define HAVE_UUID_T
+        #define HAVE_PTHREAD_H
 	#endif
 
-#endif /* !defined(HAVE_ACTIVEMQ_CONFIG) */
+#endif /* !defined(HAVE_CONFIG_H) */
 
 // Macro to mark attributes as unused
 #ifdef __GNUC__
-   #define ACTIVEMQ_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+   #define AMQCPP_UNUSED __attribute__ ((__unused__))
 #else
-   #define ACTIVEMQ_ATTRIBUTE_UNUSED
+   #define AMQCPP_UNUSED
 #endif
 
 

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.cpp Mon Jan 22 10:14:06 2007
@@ -22,10 +22,10 @@
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////
-Guid::Guid(void)
+Guid::Guid()
 {
     // Clear internal uuid, would pass isNull
-    #if (defined( HAVE_UUID_H ) || defined(HAVE_UUID_UUID_H)) 
+    #if !defined(HAVE_OBJBASE_H)
         memset(&uuid, 0, sizeof(uuid_t));
     #else
         ::UuidCreateNil(&uuid);
@@ -55,12 +55,12 @@
 }
    
 ////////////////////////////////////////////////////////////////////////////////
-Guid::~Guid(void)
+Guid::~Guid()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Guid::isNull(void) const
+bool Guid::isNull() const
 {
     #if !defined(HAVE_OBJBASE_H) 
         // Check the uuid APIs is null method
@@ -75,7 +75,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Guid::setNull(void)
+void Guid::setNull()
 {
     #if !defined(HAVE_OBJBASE_H) 
         // use the uuid function to clear
@@ -86,7 +86,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Guid& Guid::createGUID(void) throw( RuntimeException )
+Guid& Guid::createGUID() throw( RuntimeException )
 {
     #if !defined(HAVE_OBJBASE_H) 
         // Use the uuid_generate method to create a new GUID
@@ -107,7 +107,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string Guid::toString(void) const throw( RuntimeException )
+std::string Guid::toString() const throw( RuntimeException )
 {
     std::string uuid_str = "";
 
@@ -150,7 +150,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char* Guid::toBytes(void) const
+const unsigned char* Guid::toBytes() const
 {
     unsigned char* buffer = new unsigned char[getRawBytesSize()];
    
@@ -186,7 +186,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Guid::getRawBytesSize(void) const
+int Guid::getRawBytesSize() const
 {
     #if !defined(HAVE_OBJBASE_H) 
         return sizeof(uuid_t);
@@ -392,13 +392,13 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::string Guid::createGUIDString(void)
+std::string Guid::createGUIDString()
 {
     return Guid().createGUID().toString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const unsigned char* createGUIDBytes(void)
+const unsigned char* createGUIDBytes()
 {
     return Guid().createGUID().toBytes();
 }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Guid.h Mon Jan 22 10:14:06 2007
@@ -40,36 +40,36 @@
     {
     public:
 
-        Guid(void);
+        Guid();
         Guid(const Guid& source);
         Guid(const std::string& source)
             throw ( exceptions::IllegalArgumentException );
-        virtual ~Guid(void);
+        virtual ~Guid();
 
         /**
          * Determines if this GUID is null, if so it can be initialized with a 
          * call to <code>createGUID</code>.
          * @return true for Null GUID, false otherwise.
          */
-        bool isNull(void) const;
+        bool isNull() const;
       
         /**
          * Clears the GUID's current value and sets it to a NULL GUID value
          * will now pass <code>isNull</code>.
          */
-        void setNull(void);
+        void setNull();
 
         /**
          * Generate a new GUID which will overwrite any current GUID value
          * @return Reference to this object that now has a new GUID
          */       
-        Guid& createGUID(void) throw( exceptions::RuntimeException );
+        Guid& createGUID() throw( exceptions::RuntimeException );
 
         /** 
          * Converts the GUID to a string and returns that string
          * @return a string with this GUID's stringified value
          */
-        std::string toString(void) const throw( exceptions::RuntimeException );
+        std::string toString() const throw( exceptions::RuntimeException );
       
         /** 
          * Converts the GUID to a byte array and return a pointer to the
@@ -77,7 +77,7 @@
          * when done.  
          * @return a byte array with the GUID byte value, size = 16
          */
-        const unsigned char* toBytes(void) const;
+        const unsigned char* toBytes() const;
       
         /**
          * Initializes this GUID with the GUID specified in the bytes parameter
@@ -91,7 +91,7 @@
          * GUID.
          * @return size of the Raw bytes representation
          */
-        int getRawBytesSize(void) const;
+        int getRawBytesSize() const;
 
         /**
          * string type cast operator
@@ -162,22 +162,24 @@
          * Static Guid Creation Method, creates a GUID and returns it as a string
          * @return Guid string.
          */
-        static std::string createGUIDString(void);
+        static std::string createGUIDString();
       
         /**
          * Static Guid Create Method, create a GUID and returns the byte representation
          * of the new GUID.
          * @return Guid bytes array, size is 16
          */
-        static const unsigned char* createGUIDBytes(void);
+        static const unsigned char* createGUIDBytes();
    
     private:
 
         // the uuid that this object represents.
-        #if defined( unix ) || defined(__APPLE__)
+        #ifdef HAVE_OBJBASE_H
+            ::GUID uuid;
+        #elif defined(HAVE_UUID_T)
             uuid_t uuid;
         #else
-            ::GUID uuid;
+            #error Platform does not support any of the standard UUID types
         #endif
 
    };

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp Mon Jan 22 10:14:06 2007
@@ -198,7 +198,7 @@
     AMQ_CATCHALL_THROW( ActiveMQException )
 }
 
-void SimpleRollbackTest::onException( const cms::CMSException& error ACTIVEMQ_ATTRIBUTE_UNUSED)
+void SimpleRollbackTest::onException( const cms::CMSException& error AMQCPP_UNUSED)
 {
     bool AbstractTester = false;
     CPPUNIT_ASSERT( AbstractTester );

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp Mon Jan 22 10:14:06 2007
@@ -22,7 +22,7 @@
 #include <activemq/util/Config.h>
 #include <iostream>
 
-int main( int argc ACTIVEMQ_ATTRIBUTE_UNUSED, char **argv ACTIVEMQ_ATTRIBUTE_UNUSED)
+int main( int argc AMQCPP_UNUSED, char **argv AMQCPP_UNUSED)
 {
     try
     {

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h Mon Jan 22 10:14:06 2007
@@ -57,7 +57,7 @@
       
    	virtual ~ThreadPoolTest() {};
       
-      virtual void onTaskComplete(Runnable* task ACTIVEMQ_ATTRIBUTE_UNUSED)
+      virtual void onTaskComplete(Runnable* task AMQCPP_UNUSED)
       {
         try{
              synchronized(&mutex)
@@ -74,8 +74,8 @@
         }
       }
 
-      virtual void onTaskException(Runnable* task ACTIVEMQ_ATTRIBUTE_UNUSED, 
-        exceptions::ActiveMQException& ex ACTIVEMQ_ATTRIBUTE_UNUSED)
+      virtual void onTaskException(Runnable* task AMQCPP_UNUSED, 
+        exceptions::ActiveMQException& ex AMQCPP_UNUSED)
       {
          caughtEx = true;
       }

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h Mon Jan 22 10:14:06 2007
@@ -41,8 +41,8 @@
 		public:
 		
 		   virtual Connector* createConnector(
-		      const activemq::util::Properties& properties ACTIVEMQ_ATTRIBUTE_UNUSED,
-            activemq::transport::Transport*   transport ACTIVEMQ_ATTRIBUTE_UNUSED) { return NULL; };
+		      const activemq::util::Properties& properties AMQCPP_UNUSED,
+            activemq::transport::Transport*   transport AMQCPP_UNUSED) { return NULL; };
 		};
         
         virtual ~ConnectorFactoryMapRegistrarTest(){}

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h Mon Jan 22 10:14:06 2007
@@ -48,50 +48,50 @@
 		      virtual SessionInfo* createSessionInfo(void) throw( ConnectorException )
 		      { return NULL; };
 		
-		      virtual cms::Topic* createTopic(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual cms::Topic* createTopic(const std::string& name AMQCPP_UNUSED, SessionInfo* session AMQCPP_UNUSED)
 		          throw ( ConnectorException )
 		      { return NULL; };
-		      virtual cms::Queue* createQueue(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual cms::Queue* createQueue(const std::string& name AMQCPP_UNUSED, SessionInfo* session AMQCPP_UNUSED)
 		         throw ( ConnectorException )
 		      { return NULL; };
 		          
-		      virtual cms::TemporaryTopic* createTemporaryTopic(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, 
-		                                                    SessionInfo*       session ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual cms::TemporaryTopic* createTemporaryTopic(const std::string& name AMQCPP_UNUSED, 
+		                                                    SessionInfo*       session AMQCPP_UNUSED)
 		         throw ( ConnectorException )
 		     { return NULL; };
 		         
-		       virtual cms::TemporaryQueue* createTemporaryQueue(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, 
-		                                                    SessionInfo*       session ACTIVEMQ_ATTRIBUTE_UNUSED)
+		       virtual cms::TemporaryQueue* createTemporaryQueue(const std::string& name AMQCPP_UNUSED, 
+		                                                    SessionInfo*       session AMQCPP_UNUSED)
 		          throw ( ConnectorException )
 		       { return NULL; };
 		          
-		      virtual void Send(cms::Message* message ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {};
-		      virtual void Send(std::list<cms::Message*>& messages ACTIVEMQ_ATTRIBUTE_UNUSED) 
+		      virtual void Send(cms::Message* message AMQCPP_UNUSED) throw ( ConnectorException ) {};
+		      virtual void Send(std::list<cms::Message*>& messages AMQCPP_UNUSED) 
 		         throw ( ConnectorException ) {};
-            virtual void Acknowledge(cms::Message* message ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {};
-		      virtual TransactionInfo* startTransaction(SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) 
+            virtual void Acknowledge(cms::Message* message AMQCPP_UNUSED) throw ( ConnectorException ) {};
+		      virtual TransactionInfo* startTransaction(SessionInfo* session AMQCPP_UNUSED) 
 		         throw ( ConnectorException ) { return NULL; };
-		      virtual void commit(TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual void commit(TransactionInfo* transaction AMQCPP_UNUSED, SessionInfo* session AMQCPP_UNUSED)
 		         throw ( ConnectorException ) {};
-		      virtual void rollback(TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual void rollback(TransactionInfo* transaction AMQCPP_UNUSED, SessionInfo* session AMQCPP_UNUSED)
 		         throw ( ConnectorException ) {};
 		
-		      virtual cms::BytesMessage* createByteMessage(SessionInfo*     session ACTIVEMQ_ATTRIBUTE_UNUSED,
-		                                             TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual cms::BytesMessage* createByteMessage(SessionInfo*     session AMQCPP_UNUSED,
+		                                             TransactionInfo* transaction AMQCPP_UNUSED)
 		                                               throw ( ConnectorException )
 		      { return NULL; };
-		      virtual cms::TextMessage* createTextMessage(SessionInfo*     session ACTIVEMQ_ATTRIBUTE_UNUSED,
-		                                             TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual cms::TextMessage* createTextMessage(SessionInfo*     session AMQCPP_UNUSED,
+		                                             TransactionInfo* transaction AMQCPP_UNUSED)
 		                                               throw ( ConnectorException )
 		      { return NULL; };
-		      virtual void subscribe(cms::Destination* destination ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual void subscribe(cms::Destination* destination AMQCPP_UNUSED, SessionInfo* session AMQCPP_UNUSED)
 		         throw ( ConnectorException ) {};
-		      virtual void unsubscribe(cms::Destination* destination ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED)
+		      virtual void unsubscribe(cms::Destination* destination AMQCPP_UNUSED, SessionInfo* session AMQCPP_UNUSED)
 		         throw ( ConnectorException ) {};
-		      virtual void addMessageListener(cms::MessageListener* listener ACTIVEMQ_ATTRIBUTE_UNUSED) {};
-		      virtual void removeMessageListener(cms::MessageListener* listener ACTIVEMQ_ATTRIBUTE_UNUSED) {};
-            virtual void addExceptionListener(cms::ExceptionListener* listener ACTIVEMQ_ATTRIBUTE_UNUSED) {};
-            virtual void removeExceptionListener(cms::ExceptionListener* listener ACTIVEMQ_ATTRIBUTE_UNUSED) {};
+		      virtual void addMessageListener(cms::MessageListener* listener AMQCPP_UNUSED) {};
+		      virtual void removeMessageListener(cms::MessageListener* listener AMQCPP_UNUSED) {};
+            virtual void addExceptionListener(cms::ExceptionListener* listener AMQCPP_UNUSED) {};
+            virtual void removeExceptionListener(cms::ExceptionListener* listener AMQCPP_UNUSED) {};
 		
 		};
 		
@@ -104,8 +104,8 @@
 		public:
 		
 		   virtual Connector* createConnector(
-		      const activemq::util::Properties& properties ACTIVEMQ_ATTRIBUTE_UNUSED,
-            activemq::transport::Transport*   transport ACTIVEMQ_ATTRIBUTE_UNUSED) { return NULL; };
+		      const activemq::util::Properties& properties AMQCPP_UNUSED,
+            activemq::transport::Transport*   transport AMQCPP_UNUSED) { return NULL; };
 		};
 		
 		void test(){

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h Mon Jan 22 10:14:06 2007
@@ -60,7 +60,7 @@
                 int num;
                 MyExceptionListener(){ num=0;}
                 virtual ~MyExceptionListener(){}
-                virtual void onException( const cms::CMSException& ex ACTIVEMQ_ATTRIBUTE_UNUSED){
+                virtual void onException( const cms::CMSException& ex AMQCPP_UNUSED){
                     num++;
                 }
         };        

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h Mon Jan 22 10:14:06 2007
@@ -48,7 +48,7 @@
             TestAckHandler() { wasAcked = false; }
             virtual ~TestAckHandler() {}
             
-            virtual void acknowledgeMessage( const core::ActiveMQMessage* message ACTIVEMQ_ATTRIBUTE_UNUSED)
+            virtual void acknowledgeMessage( const core::ActiveMQMessage* message AMQCPP_UNUSED)
                 throw ( cms::CMSException ) 
             {
                 wasAcked = true;

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h Mon Jan 22 10:14:06 2007
@@ -51,7 +51,7 @@
             TestAckHandler(void) { wasAcked = false; }
             virtual ~TestAckHandler(void) {}
             
-            virtual void acknowledgeMessage( const core::ActiveMQMessage* message ACTIVEMQ_ATTRIBUTE_UNUSED)
+            virtual void acknowledgeMessage( const core::ActiveMQMessage* message AMQCPP_UNUSED)
                 throw ( cms::CMSException ) 
             {
                 wasAcked = true;

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h?view=diff&rev=498736&r1=498735&r2=498736
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h Mon Jan 22 10:14:06 2007
@@ -46,7 +46,7 @@
             TestAckHandler(void) { wasAcked = false; }
             virtual ~TestAckHandler(void) {}
             
-            virtual void acknowledgeMessage( const core::ActiveMQMessage* message ACTIVEMQ_ATTRIBUTE_UNUSED)
+            virtual void acknowledgeMessage( const core::ActiveMQMessage* message AMQCPP_UNUSED)
                 throw ( cms::CMSException ) 
             {
                 wasAcked = true;



Mime
View raw message