activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r756129 - in /activemq/activemq-cpp/trunk/src/main/activemq: exceptions/ActiveMQException.h transport/failover/FailoverTransport.cpp
Date Thu, 19 Mar 2009 18:36:46 GMT
Author: tabish
Date: Thu Mar 19 18:36:45 2009
New Revision: 756129

URL: http://svn.apache.org/viewvc?rev=756129&view=rev
Log:
Changes needed to build on Windows

Modified:
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/ActiveMQException.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp

Modified: activemq/activemq-cpp/trunk/src/main/activemq/exceptions/ActiveMQException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/exceptions/ActiveMQException.h?rev=756129&r1=756128&r2=756129&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/exceptions/ActiveMQException.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/exceptions/ActiveMQException.h Thu Mar 19
18:36:45 2009
@@ -17,6 +17,10 @@
 #ifndef _ACTIVEMQ_EXCEPTIONS_ACTIVEMQEXCEPTION_H_
 #define _ACTIVEMQ_EXCEPTIONS_ACTIVEMQEXCEPTION_H_
 
+#ifdef _MSC_VER
+#pragma warning( disable : 4250 )
+#endif
+
 #include <activemq/util/Config.h>
 #include <cms/CMSException.h>
 #include <decaf/lang/Exception.h>

Modified: activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp?rev=756129&r1=756128&r2=756129&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/transport/failover/FailoverTransport.cpp
Thu Mar 19 18:36:45 2009
@@ -165,7 +165,7 @@
         rand.setSeed( decaf::lang::System::currentTimeMillis() );
 
         for( std::size_t i = 0; i < result.size(); i++ ) {
-            int p = rand.nextInt( result.size() );
+            int p = rand.nextInt( (int)result.size() );
             URI temp = result.get( p );
             result.set( p, result.get( i ) );
             result.set( i, temp );
@@ -612,7 +612,7 @@
     if( !closed ) {
 
         synchronized( &sleepMutex ) {
-            sleepMutex.wait( reconnectDelay );
+            sleepMutex.wait( (unsigned int)reconnectDelay );
         }
 
         if( useExponentialBackOff ) {



Mime
View raw message