activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r825124 [1/3] - in /activemq/activemq-cpp/trunk/activemq-cpp: src/main/decaf/util/concurrent/locks/ReentrantLock.cpp vs2005-build/vs2005-activemq-unittests.vcproj vs2005-build/vs2005-activemq.vcproj
Date Wed, 14 Oct 2009 13:06:43 GMT
Author: tabish
Date: Wed Oct 14 13:06:42 2009
New Revision: 825124

URL: http://svn.apache.org/viewvc?rev=825124&view=rev
Log:
Fix some build issues on windows update the project files.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp?rev=825124&r1=825123&r2=825124&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
Wed Oct 14 13:06:42 2009
@@ -112,7 +112,7 @@
 #ifdef HAVE_PTHREAD_H
             pthread_mutex_destroy( &handle );
 #else
-            DeleteCriticalSection( &mutex );
+            DeleteCriticalSection( &handle );
 #endif
         }
 
@@ -370,7 +370,7 @@
     long long threadId = Thread::getId();
 
     if( threadId == handle->lock_owner_tid ) {
-        return handle->lock_count;
+        return (int)handle->lock_count;
     }
 
     return 0;



Mime
View raw message