Author: tabish
Date: Mon Mar 22 14:19:46 2010
New Revision: 926096
URL: http://svn.apache.org/viewvc?rev=926096&view=rev
Log:
Fix several warnings generated when the GCC -Weffc++ warning is enabled.
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlMap.h
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedConsumer.h
Mon Mar 22 14:19:46 2010
@@ -32,10 +32,14 @@ namespace cmsutil {
cms::MessageConsumer* consumer;
+ protected:
+
+ CachedConsumer( const CachedConsumer& );
+ CachedConsumer& operator= ( const CachedConsumer& );
+
public:
- CachedConsumer( cms::MessageConsumer* consumer ) {
- this->consumer = consumer;
+ CachedConsumer( cms::MessageConsumer* consumer ) : consumer( consumer
) {
}
virtual ~CachedConsumer() {}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CachedProducer.h
Mon Mar 22 14:19:46 2010
@@ -32,10 +32,14 @@ namespace cmsutil {
cms::MessageProducer* producer;
+ protected:
+
+ CachedProducer( const CachedProducer& );
+ CachedProducer& operator= ( const CachedProducer& );
+
public:
- CachedProducer( cms::MessageProducer* producer ) {
- this->producer = producer;
+ CachedProducer( cms::MessageProducer* producer ) : producer( producer
) {
}
virtual ~CachedProducer() {}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.cpp
Mon Mar 22 14:19:46 2010
@@ -25,8 +25,9 @@ using namespace activemq::exceptions;
using namespace decaf::lang::exceptions;
////////////////////////////////////////////////////////////////////////////////
-CmsAccessor::CmsAccessor() {
- sessionAcknowledgeMode = cms::Session::AUTO_ACKNOWLEDGE;
+CmsAccessor::CmsAccessor() : resourceLifecycleManager(),
+ connectionFactory( NULL ),
+ sessionAcknowledgeMode(
cms::Session::AUTO_ACKNOWLEDGE ) {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsAccessor.h
Mon Mar 22 14:19:46 2010
@@ -46,6 +46,11 @@ namespace cmsutil {
cms::Session::AcknowledgeMode sessionAcknowledgeMode;
+ protected:
+
+ CmsAccessor( const CmsAccessor& );
+ CmsAccessor& operator= ( const CmsAccessor& );
+
public:
CmsAccessor();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.cpp
Mon Mar 22 14:19:46 2010
@@ -21,13 +21,12 @@ using namespace activemq::cmsutil;
using namespace decaf::lang::exceptions;
////////////////////////////////////////////////////////////////////////////////
-CmsDestinationAccessor::CmsDestinationAccessor() {
+CmsDestinationAccessor::CmsDestinationAccessor() : CmsAccessor(),
+
defaultDestinationResolver(),
+ destinationResolver(
&defaultDestinationResolver ),
+ pubSubDomain( false ) {
- // Default to using queues.
- pubSubDomain = false;
-
- // Start with the default destinationResolver.
- destinationResolver = &defaultDestinationResolver;
+ // Default to using queues, and start with the default destinationResolver.
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h
Mon Mar 22 14:19:46 2010
@@ -50,6 +50,11 @@ namespace cmsutil {
*/
bool pubSubDomain;
+ protected:
+
+ CmsDestinationAccessor( const CmsDestinationAccessor& );
+ CmsDestinationAccessor& operator= ( const CmsDestinationAccessor& );
+
public:
CmsDestinationAccessor();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.cpp
Mon Mar 22 14:19:46 2010
@@ -65,12 +65,18 @@ using namespace std;
}
////////////////////////////////////////////////////////////////////////////////
-CmsTemplate::CmsTemplate() {
+const long long CmsTemplate::RECEIVE_TIMEOUT_NO_WAIT = -1;
+const long long CmsTemplate::RECEIVE_TIMEOUT_INDEFINITE_WAIT = 0;
+const int CmsTemplate::DEFAULT_PRIORITY = 4;
+const long long CmsTemplate::DEFAULT_TIME_TO_LIVE = 0;
+
+////////////////////////////////////////////////////////////////////////////////
+CmsTemplate::CmsTemplate() : CmsDestinationAccessor() {
initDefaults();
}
////////////////////////////////////////////////////////////////////////////////
-CmsTemplate::CmsTemplate( cms::ConnectionFactory* connectionFactory ) {
+CmsTemplate::CmsTemplate( cms::ConnectionFactory* connectionFactory ) :
CmsDestinationAccessor() {
initDefaults();
setConnectionFactory(connectionFactory);
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h
Mon Mar 22 14:19:46 2010
@@ -65,22 +65,22 @@ namespace cmsutil {
* Timeout value indicating that a receive operation should
* check if a message is immediately available without blocking.
*/
- static const long long RECEIVE_TIMEOUT_NO_WAIT = -1;
+ static const long long RECEIVE_TIMEOUT_NO_WAIT;
/**
* Timeout value indicating a blocking receive without timeout.
*/
- static const long long RECEIVE_TIMEOUT_INDEFINITE_WAIT = 0;
+ static const long long RECEIVE_TIMEOUT_INDEFINITE_WAIT;
/**
* Default message priority.
*/
- static const int DEFAULT_PRIORITY = 4;
+ static const int DEFAULT_PRIORITY;
/**
* My default, messages should live forever.
*/
- static const long long DEFAULT_TIME_TO_LIVE = 0;
+ static const long long DEFAULT_TIME_TO_LIVE;
public:
@@ -96,15 +96,17 @@ namespace cmsutil {
CmsTemplate* parent;
cms::Destination* destination;
+ protected:
+
+ ProducerExecutor( const ProducerExecutor& );
+ ProducerExecutor& operator= ( const ProducerExecutor& );
+
public:
ProducerExecutor( ProducerCallback* action,
CmsTemplate* parent,
- cms::Destination* destination ){
-
- this->action = action;
- this->parent = parent;
- this->destination = destination;
+ cms::Destination* destination )
+ : SessionCallback(), action( action ), parent( parent ),
destination( destination ) {
}
virtual ~ProducerExecutor() {}
@@ -127,15 +129,17 @@ namespace cmsutil {
std::string destinationName;
+ protected:
+
+ ResolveProducerExecutor( const ResolveProducerExecutor& );
+ ResolveProducerExecutor& operator= ( const
ResolveProducerExecutor& );
+
public:
ResolveProducerExecutor( ProducerCallback* action,
CmsTemplate* parent,
const std::string& destinationName )
- :
- ProducerExecutor( action, parent, NULL ) {
-
- this->destinationName = destinationName;
+ : ProducerExecutor( action, parent, NULL ), destinationName(
destinationName ) {
}
virtual ~ResolveProducerExecutor() {}
@@ -155,12 +159,16 @@ namespace cmsutil {
MessageCreator* messageCreator;
CmsTemplate* parent;
+ protected:
+
+ SendExecutor( const SendExecutor& );
+ SendExecutor& operator= ( const SendExecutor& );
+
public:
SendExecutor( MessageCreator* messageCreator,
- CmsTemplate* parent ) {
- this->messageCreator = messageCreator;
- this->parent = parent;
+ CmsTemplate* parent )
+ : ProducerCallback(), messageCreator( messageCreator ), parent(
parent ) {
}
virtual ~SendExecutor() {}
@@ -185,17 +193,23 @@ namespace cmsutil {
cms::Message* message;
CmsTemplate* parent;
+ protected:
+
+ ReceiveExecutor( const ReceiveExecutor& );
+ ReceiveExecutor& operator= ( const ReceiveExecutor& );
+
public:
ReceiveExecutor( CmsTemplate* parent,
cms::Destination* destination,
const std::string& selector,
- bool noLocal ) {
- this->parent = parent;
- this->destination = destination;
- this->selector = selector;
- this->noLocal = noLocal;
- this->message = NULL;
+ bool noLocal )
+ : SessionCallback(),
+ destination( destination ),
+ selector( selector ),
+ noLocal( noLocal ),
+ message( NULL ),
+ parent( parent ) {
}
virtual ~ReceiveExecutor() {}
@@ -223,16 +237,19 @@ namespace cmsutil {
std::string destinationName;
+ protected:
+
+ ResolveReceiveExecutor( const ResolveReceiveExecutor& );
+ ResolveReceiveExecutor& operator= ( const ResolveReceiveExecutor&
);
+
public:
ResolveReceiveExecutor( CmsTemplate* parent,
const std::string& selector,
bool noLocal,
const std::string& destinationName )
- :
- ReceiveExecutor( parent, NULL, selector, noLocal ) {
+ : ReceiveExecutor( parent, NULL, selector, noLocal ),
destinationName( destinationName ) {
- this->destinationName = destinationName;
}
virtual ~ResolveReceiveExecutor() {}
@@ -271,6 +288,11 @@ namespace cmsutil {
bool initialized;
+ protected:
+
+ CmsTemplate( const CmsTemplate& );
+ CmsTemplate& operator= ( const CmsTemplate& );
+
public:
CmsTemplate();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.cpp
Mon Mar 22 14:19:46 2010
@@ -73,6 +73,11 @@ cms::Queue* DynamicDestinationResolver::
}
////////////////////////////////////////////////////////////////////////////////
+DynamicDestinationResolver::DynamicDestinationResolver()
+ : DestinationResolver(), sessionResolverMap(), resourceLifecycleManager(
NULL ) {
+}
+
+////////////////////////////////////////////////////////////////////////////////
DynamicDestinationResolver::~DynamicDestinationResolver() {
destroy();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h
Mon Mar 22 14:19:46 2010
@@ -42,13 +42,19 @@ namespace cmsutil {
decaf::util::StlMap<std::string, cms::Topic*> topicMap;
decaf::util::StlMap<std::string, cms::Queue*> queueMap;
- public:
+ protected:
+
+ SessionResolver( const SessionResolver& );
+ SessionResolver& operator= ( const SessionResolver& );
- SessionResolver(cms::Session* session,
- ResourceLifecycleManager* resourceLifecycleManager ) {
+ public:
- this->session = session;
- this->resourceLifecycleManager = resourceLifecycleManager;
+ SessionResolver( cms::Session* session,
+ ResourceLifecycleManager*
resourceLifecycleManager )
+ : resourceLifecycleManager( resourceLifecycleManager ),
+ session( session ),
+ topicMap(),
+ queueMap() {
}
virtual ~SessionResolver() {}
@@ -71,8 +77,15 @@ namespace cmsutil {
*/
ResourceLifecycleManager* resourceLifecycleManager;
+ protected:
+
+ DynamicDestinationResolver( const DynamicDestinationResolver& );
+ DynamicDestinationResolver& operator= ( const
DynamicDestinationResolver& );
+
public:
+ DynamicDestinationResolver();
+
virtual ~DynamicDestinationResolver();
virtual void init( ResourceLifecycleManager* mgr ) {
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.cpp
Mon Mar 22 14:19:46 2010
@@ -26,9 +26,8 @@ using namespace activemq::cmsutil;
using namespace activemq::exceptions;
////////////////////////////////////////////////////////////////////////////////
-PooledSession::PooledSession( SessionPool* pool, cms::Session* session ) {
- this->session = session;
- this->pool = pool;
+PooledSession::PooledSession( SessionPool* pool, cms::Session* session )
+ : pool( pool ), session( session ), producerCache(), consumerCache() {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/PooledSession.h
Mon Mar 22 14:19:46 2010
@@ -45,6 +45,11 @@ namespace cmsutil {
decaf::util::StlMap<std::string, CachedConsumer*> consumerCache;
+ protected:
+
+ PooledSession( const PooledSession& );
+ PooledSession& operator= ( const PooledSession& );
+
public:
PooledSession( SessionPool* pool, cms::Session* session );
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/ResourceLifecycleManager.h
Mon Mar 22 14:19:46 2010
@@ -49,6 +49,11 @@ namespace cmsutil {
ProducerList producers;
ConsumerList consumers;
+ protected:
+
+ ResourceLifecycleManager( const ResourceLifecycleManager& );
+ ResourceLifecycleManager& operator= ( const ResourceLifecycleManager&
);
+
public:
ResourceLifecycleManager();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.cpp
Mon Mar 22 14:19:46 2010
@@ -21,14 +21,28 @@
using namespace activemq::cmsutil;
using namespace std;
+cms::Connection* connection;
+
+ResourceLifecycleManager* resourceLifecycleManager;
+
+decaf::util::concurrent::Mutex mutex;
+
+std::list<PooledSession*> available;
+
+std::list<PooledSession*> sessions;
+
+cms::Session::AcknowledgeMode acknowledgeMode;
+
////////////////////////////////////////////////////////////////////////////////
SessionPool::SessionPool( cms::Connection* connection,
cms::Session::AcknowledgeMode ackMode,
- ResourceLifecycleManager* resourceLifecycleManager) {
-
- this->connection = connection;
- this->acknowledgeMode = ackMode;
- this->resourceLifecycleManager = resourceLifecycleManager;
+ ResourceLifecycleManager* resourceLifecycleManager)
+ : connection( connection ),
+ resourceLifecycleManager( resourceLifecycleManager ),
+ mutex(),
+ available(),
+ sessions(),
+ acknowledgeMode( ackMode ) {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/SessionPool.h
Mon Mar 22 14:19:46 2010
@@ -51,6 +51,11 @@ namespace cmsutil {
cms::Session::AcknowledgeMode acknowledgeMode;
+ protected:
+
+ SessionPool( const SessionPool& );
+ SessionPool& operator= ( const SessionPool& );
+
public:
/**
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlMap.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlMap.h?rev=926096&r1=926095&r2=926096&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlMap.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlMap.h Mon
Mar 22 14:19:46 2010
@@ -47,14 +47,14 @@ namespace util{
/**
* Default constructor - does nothing.
*/
- StlMap() : Map<K,V,COMPARATOR>() {}
+ StlMap() : Map<K,V,COMPARATOR>(), valueMap(), mutex() {}
/**
* Copy constructor - copies the content of the given map into this
* one.
* @param source The source map.
*/
- StlMap( const StlMap& source ) : Map<K,V,COMPARATOR>() {
+ StlMap( const StlMap& source ) : Map<K,V,COMPARATOR>(), valueMap(),
mutex() {
copy( source );
}
@@ -63,7 +63,7 @@ namespace util{
* one.
* @param source The source map.
*/
- StlMap( const Map<K,V,COMPARATOR>& source ) : Map<K,V,COMPARATOR>() {
+ StlMap( const Map<K,V,COMPARATOR>& source ) : Map<K,V,COMPARATOR>(),
valueMap(), mutex() {
copy( source );
}
