From commits-return-12027-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Wed Oct 14 13:07:14 2009 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 67314 invoked from network); 14 Oct 2009 13:07:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Oct 2009 13:07:07 -0000 Received: (qmail 29965 invoked by uid 500); 14 Oct 2009 13:07:06 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 29931 invoked by uid 500); 14 Oct 2009 13:07:06 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 29922 invoked by uid 99); 14 Oct 2009 13:07:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Oct 2009 13:07:06 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Oct 2009 13:07:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E11F123888DD; Wed, 14 Oct 2009 13:06:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091014130643.E11F123888DD@eris.apache.org> 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;