Author: tabish
Date: Tue Sep 22 12:54:28 2009
New Revision: 817642
URL: http://svn.apache.org/viewvc?rev=817642&view=rev
Log:
Add the ReentrantLock class and update the makefiles fix a couple compile
errors.
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/Condition.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/unix/ReentrantLock.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/windows/ReentrantLock.cpp
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?rev=817642&r1=817641&r2=817642&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Tue Sep 22
12:54:28 2009
@@ -550,6 +550,8 @@
decaf/util/concurrent/TimeUnit.cpp \
decaf/util/concurrent/atomic/AtomicBoolean.cpp \
decaf/util/concurrent/atomic/AtomicInteger.cpp \
+ decaf/util/concurrent/locks/unix/ReentrantLock.cpp \
+ decaf/util/concurrent/locks/windows/ReentrantLock.cpp \
decaf/util/logging/LogManager.cpp \
decaf/util/logging/LogWriter.cpp \
decaf/util/logging/Logger.cpp \
@@ -1107,6 +1109,8 @@
decaf/internal/util/concurrent/SynchronizableImpl.h \
decaf/internal/util/concurrent/unix/ConditionHandle.h \
decaf/internal/util/concurrent/unix/MutexHandle.h \
+ decaf/internal/util/concurrent/windows/ConditionHandle.h \
+ decaf/internal/util/concurrent/windows/MutexHandle.h \
decaf/io/BlockingByteArrayInputStream.h \
decaf/io/BufferedInputStream.h \
decaf/io/BufferedOutputStream.h \
@@ -1258,6 +1262,7 @@
decaf/util/concurrent/locks/Condition.h \
decaf/util/concurrent/locks/Lock.h \
decaf/util/concurrent/locks/ReadWriteLock.h \
+ decaf/util/concurrent/locks/ReentrantLock.h \
decaf/util/logging/ConsoleHandler.h \
decaf/util/logging/Filter.h \
decaf/util/logging/Formatter.h \
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/Condition.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/Condition.h?rev=817642&r1=817641&r2=817642&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/Condition.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/Condition.h
Tue Sep 22 12:54:28 2009
@@ -21,6 +21,8 @@
#include <decaf/util/Config.h>
#include <decaf/util/Date.h>
+#include <decaf/util/concurrent/TimeUnit.h>
+#include <decaf/lang/exceptions/RuntimeException.h>
#include <decaf/lang/exceptions/InterruptedException.h>
#include <decaf/lang/exceptions/IllegalMonitorStateException.h>
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h?rev=817642&r1=817641&r2=817642&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h
Tue Sep 22 12:54:28 2009
@@ -22,6 +22,8 @@
#include <decaf/util/concurrent/locks/Lock.h>
+#include <memory>
+
namespace decaf {
namespace util {
namespace concurrent {
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/unix/ReentrantLock.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/unix/ReentrantLock.cpp?rev=817642&r1=817641&r2=817642&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/unix/ReentrantLock.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/unix/ReentrantLock.cpp
Tue Sep 22 12:54:28 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "ReentrantLock.h"
+#include <decaf/util/concurrent/locks/ReentrantLock.h>
using namespace decaf;
using namespace decaf::lang;
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/windows/ReentrantLock.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/windows/ReentrantLock.cpp?rev=817642&r1=817641&r2=817642&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/windows/ReentrantLock.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/windows/ReentrantLock.cpp
Tue Sep 22 12:54:28 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "ReentrantLock.h"
+#include <decaf/util/concurrent/locks/ReentrantLock.h>
using namespace decaf;
using namespace decaf::lang;
