activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r555272 - in /activemq/activemq-cpp/trunk/src/decaf/src/main: Makefile.am decaf/util/Map.h decaf/util/Set.h
Date Wed, 11 Jul 2007 13:56:12 GMT
Author: tabish
Date: Wed Jul 11 06:56:10 2007
New Revision: 555272

URL: http://svn.apache.org/viewvc?view=rev&rev=555272
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Modified:
    activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am
    activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Map.h
    activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Set.h

Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am?view=diff&rev=555272&r1=555271&r2=555272
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/Makefile.am Wed Jul 11 06:56:10 2007
@@ -135,18 +135,17 @@
 ##
 ## Compiler / Linker Info
 ##
-
 lib_LIBRARIES= libdecaf.a
 libdecaf_a_SOURCES= $(h_sources) $(cc_sources)
 
 ##
-## Uncomment to build a shared lib
+## LibTool build step
 ##
-##lib_LTLIBRARIES= libactivemq-cpp.la
-##libdecaf_la_SOURCES= $(h_sources) $(cc_sources)
-##libdecaf_la_LDFLAGS= -version-info $(DECAF_LIBRARY_VERSION) -release $(DECAF_VERSION)
-##libdecaf_la_LIBADD=-lpthread -ldl -luuid
-
+lib_LTLIBRARIES= libdecaf.la
+libdecaf_la_SOURCES= $(h_sources) $(cc_sources)
+libdecaf_la_CXXFLAGS= $(DECAF_CXXFLAGS)
+libdecaf_la_LDFLAGS= -version-info $(DECAF_LIBRARY_VERSION) -release $(DECAF_VERSION)
+libdecaf_la_LIBADD= $(DECAF_LIBS)
 
 ##
 ## Packaging Info

Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Map.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Map.h?view=diff&rev=555272&r1=555271&r2=555272
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Map.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Map.h Wed Jul 11 06:56:10 2007
@@ -149,7 +149,7 @@
             typename std::map<K,V>::const_iterator iter;
             iter = valueMap.find(key);
             if( iter == valueMap.end() ){
-                throw activemq::exceptions::NoSuchElementException( __FILE__,
+                throw lang::exceptions::NoSuchElementException( __FILE__,
                     __LINE__,
                     "Key does not exist in map" );
             }

Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Set.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Set.h?view=diff&rev=555272&r1=555271&r2=555272
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Set.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Set.h Wed Jul 11 06:56:10 2007
@@ -25,7 +25,7 @@
 #include <decaf/util/concurrent/Mutex.h>
 #include <decaf/util/Iterator.h>
 
-namespace activemq{
+namespace decaf{
 namespace util{
 
     /**
@@ -33,12 +33,12 @@
      * a more user-friendly interface and to provide common
      * functions that do not exist in std::map.
      */
-    template <typename E> class DECAF_API Set : public concurrent::Synchronizable
+    template <typename E> class DECAF_API Set : public util::concurrent::Synchronizable
     {
     private:
 
         std::set<E> values;
-        concurrent::Mutex mutex;
+        util::concurrent::Mutex mutex;
 
     private:
 
@@ -60,7 +60,7 @@
 
             virtual E next() throw( lang::exceptions::NoSuchElementException ){
                 if( this->current == set->end() ) {
-                    throw exceptions::NoSuchElementException(
+                    throw lang::exceptions::NoSuchElementException(
                         __FILE__, __LINE__,
                         "Set::Iterator::next - No more elements to return" );
                 }
@@ -191,7 +191,7 @@
 
         /**
          * Locks the object.
-         * @throws ActiveMQException
+         * @throws Exception
          */
         virtual void lock() throw( lang::Exception ) {
             mutex.lock();
@@ -199,7 +199,7 @@
 
         /**
          * Unlocks the object.
-         * @throws ActiveMQException
+         * @throws Exception
          */
         virtual void unlock() throw( lang::Exception ) {
             mutex.unlock();
@@ -209,7 +209,7 @@
          * Waits on a signal from this object, which is generated
          * by a call to Notify.  Must have this object locked before
          * calling.
-         * @throws ActiveMQException
+         * @throws Exception
          */
         virtual void wait() throw( lang::Exception ) {
             mutex.wait();
@@ -222,7 +222,7 @@
          * interval.
          * @param millisecs the time in millisecsonds to wait, or
          * WAIT_INIFINITE
-         * @throws ActiveMQException
+         * @throws Exception
          */
         virtual void wait( unsigned long millisecs )
             throw( lang::Exception ) {
@@ -233,7 +233,7 @@
          * Signals a waiter on this object that it can now wake
          * up and continue.  Must have this object locked before
          * calling.
-         * @throws ActiveMQException
+         * @throws Exception
          */
         virtual void notify() throw(  lang::Exception  ) {
             mutex.notify();
@@ -243,7 +243,7 @@
          * Signals the waiters on this object that it can now wake
          * up and continue.  Must have this object locked before
          * calling.
-         * @throws ActiveMQException
+         * @throws Exception
          */
         virtual void notifyAll() throw(  lang::Exception  ) {
             mutex.notifyAll();



Mime
View raw message