You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/03/22 22:10:07 UTC
svn commit: r926339 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main:
activemq/cmsutil/ activemq/transport/ decaf/io/ decaf/lang/ decaf/util/
Author: tabish
Date: Mon Mar 22 21:10:06 2010
New Revision: 926339
URL: http://svn.apache.org/viewvc?rev=926339&view=rev
Log:
Some recent changes broke Windows DLL builds, fix some of those errors.
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.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsDestinationAccessor.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/CmsTemplate.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/cmsutil/DynamicDestinationResolver.h
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.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -34,8 +34,8 @@ namespace cmsutil {
protected:
- CachedConsumer( const CachedConsumer& );
- CachedConsumer& operator= ( const CachedConsumer& );
+ CachedConsumer( const CachedConsumer& ) {}
+ CachedConsumer& operator= ( const CachedConsumer& ) { return *this; }
public:
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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -34,8 +34,8 @@ namespace cmsutil {
protected:
- CachedProducer( const CachedProducer& );
- CachedProducer& operator= ( const CachedProducer& );
+ CachedProducer( const CachedProducer& ) {}
+ CachedProducer& operator= ( const CachedProducer& ) { return *this; }
public:
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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -48,8 +48,8 @@ namespace cmsutil {
protected:
- CmsAccessor( const CmsAccessor& );
- CmsAccessor& operator= ( const CmsAccessor& );
+ CmsAccessor( const CmsAccessor& ) {}
+ CmsAccessor& operator= ( const CmsAccessor& ) { return *this; }
public:
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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -52,8 +52,8 @@ namespace cmsutil {
protected:
- CmsDestinationAccessor( const CmsDestinationAccessor& );
- CmsDestinationAccessor& operator= ( const CmsDestinationAccessor& );
+ CmsDestinationAccessor( const CmsDestinationAccessor& ) : CmsAccessor() {}
+ CmsDestinationAccessor& operator= ( const CmsDestinationAccessor& ) { return *this; }
public:
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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -98,8 +98,8 @@ namespace cmsutil {
protected:
- ProducerExecutor( const ProducerExecutor& );
- ProducerExecutor& operator= ( const ProducerExecutor& );
+ ProducerExecutor( const ProducerExecutor& ) : SessionCallback() {}
+ ProducerExecutor& operator= ( const ProducerExecutor& ) { return *this; }
public:
@@ -131,8 +131,7 @@ namespace cmsutil {
protected:
- ResolveProducerExecutor( const ResolveProducerExecutor& );
- ResolveProducerExecutor& operator= ( const ResolveProducerExecutor& );
+ ResolveProducerExecutor& operator= ( const ResolveProducerExecutor& ) { return *this; }
public:
@@ -161,8 +160,8 @@ namespace cmsutil {
protected:
- SendExecutor( const SendExecutor& );
- SendExecutor& operator= ( const SendExecutor& );
+ SendExecutor( const SendExecutor& ) : ProducerCallback() {}
+ SendExecutor& operator= ( const SendExecutor& ) { return *this; }
public:
@@ -195,8 +194,8 @@ namespace cmsutil {
protected:
- ReceiveExecutor( const ReceiveExecutor& );
- ReceiveExecutor& operator= ( const ReceiveExecutor& );
+ ReceiveExecutor( const ReceiveExecutor& ) : SessionCallback() {}
+ ReceiveExecutor& operator= ( const ReceiveExecutor& ) { return *this; }
public:
@@ -239,8 +238,7 @@ namespace cmsutil {
protected:
- ResolveReceiveExecutor( const ResolveReceiveExecutor& );
- ResolveReceiveExecutor& operator= ( const ResolveReceiveExecutor& );
+ ResolveReceiveExecutor& operator= ( const ResolveReceiveExecutor& ) { return *this; }
public:
@@ -290,8 +288,8 @@ namespace cmsutil {
protected:
- CmsTemplate( const CmsTemplate& );
- CmsTemplate& operator= ( const CmsTemplate& );
+ CmsTemplate( const CmsTemplate& ) : CmsDestinationAccessor() {}
+ CmsTemplate& operator= ( const CmsTemplate& ) { return *this; }
public:
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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -44,8 +44,8 @@ namespace cmsutil {
protected:
- SessionResolver( const SessionResolver& );
- SessionResolver& operator= ( const SessionResolver& );
+ SessionResolver( const SessionResolver& ) {}
+ SessionResolver& operator= ( const SessionResolver& ) { return *this; }
public:
@@ -79,8 +79,8 @@ namespace cmsutil {
protected:
- DynamicDestinationResolver( const DynamicDestinationResolver& );
- DynamicDestinationResolver& operator= ( const DynamicDestinationResolver& );
+ DynamicDestinationResolver( const DynamicDestinationResolver& ) {}
+ DynamicDestinationResolver& operator= ( const DynamicDestinationResolver& ) { return *this; }
public:
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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -47,8 +47,8 @@ namespace cmsutil {
protected:
- PooledSession( const PooledSession& );
- PooledSession& operator= ( const PooledSession& );
+ PooledSession( const PooledSession& ) {}
+ PooledSession& operator= ( const PooledSession& ) { return *this; }
public:
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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -51,8 +51,8 @@ namespace cmsutil {
protected:
- ResourceLifecycleManager( const ResourceLifecycleManager& );
- ResourceLifecycleManager& operator= ( const ResourceLifecycleManager& );
+ ResourceLifecycleManager( const ResourceLifecycleManager& ) {}
+ ResourceLifecycleManager& operator= ( const ResourceLifecycleManager& ) { return *this; }
public:
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=926339&r1=926338&r2=926339&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 21:10:06 2010
@@ -53,8 +53,8 @@ namespace cmsutil {
protected:
- SessionPool( const SessionPool& );
- SessionPool& operator= ( const SessionPool& );
+ SessionPool( const SessionPool& ) {}
+ SessionPool& operator= ( const SessionPool& ) { return *this; }
public:
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h?rev=926339&r1=926338&r2=926339&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h Mon Mar 22 21:10:06 2010
@@ -67,10 +67,10 @@ namespace transport{
*/
void fire( const Pointer<Command>& command );
- protected:
+ private:
- TransportFilter( const TransportFilter& );
- TransportFilter operator= ( const TransportFilter& );
+ TransportFilter( const TransportFilter& ) {}
+ TransportFilter operator= ( const TransportFilter& ) { return *this; }
public:
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h?rev=926339&r1=926338&r2=926339&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h Mon Mar 22 21:10:06 2010
@@ -49,8 +49,8 @@ namespace io{
protected:
- FilterInputStream( const FilterInputStream& );
- FilterInputStream& operator= ( const FilterInputStream& );
+ FilterInputStream( const FilterInputStream& ) {}
+ FilterInputStream& operator= ( const FilterInputStream& ) { return *this; }
public:
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h?rev=926339&r1=926338&r2=926339&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h Mon Mar 22 21:10:06 2010
@@ -58,10 +58,10 @@ namespace io{
// Indicates that this stream was closed
volatile bool closed;
- protected:
+ private:
- FilterOutputStream( const FilterOutputStream& );
- FilterOutputStream& operator= ( const FilterOutputStream& );
+ FilterOutputStream( const FilterOutputStream& ) {}
+ FilterOutputStream& operator= ( const FilterOutputStream& ) { return *this; }
public:
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h?rev=926339&r1=926338&r2=926339&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h Mon Mar 22 21:10:06 2010
@@ -132,10 +132,10 @@ namespace lang{
};
- protected:
+ private:
- Thread( const Thread& );
- Thread& operator= ( const Thread& );
+ Thread( const Thread& ) {}
+ Thread& operator= ( const Thread& ) { return *this; }
public:
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp?rev=926339&r1=926338&r2=926339&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.cpp Mon Mar 22 21:10:06 2010
@@ -110,13 +110,12 @@ namespace {
}
////////////////////////////////////////////////////////////////////////////////
-Properties::Properties() {
- this->internal.reset( new PropertiesInternal() );
+Properties::Properties() : internal( new PropertiesInternal() ) {
}
////////////////////////////////////////////////////////////////////////////////
-Properties::Properties( const Properties& src ) {
- this->internal.reset( new PropertiesInternal() );
+Properties::Properties( const Properties& src ) : internal( new PropertiesInternal() ) {
+
this->internal->properties.copy( src.internal->properties );
if( src.defaults.get() != NULL ) {
@@ -126,6 +125,11 @@ Properties::Properties( const Properties
////////////////////////////////////////////////////////////////////////////////
Properties::~Properties() {
+ try{
+ delete this->internal;
+ }
+ DECAF_CATCH_NOTHROW( Exception )
+ DECAF_CATCHALL_NOTHROW()
}
////////////////////////////////////////////////////////////////////////////////
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h?rev=926339&r1=926338&r2=926339&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Properties.h Mon Mar 22 21:10:06 2010
@@ -53,7 +53,7 @@ namespace util{
class DECAF_API Properties{
private:
- decaf::lang::Pointer<PropertiesInternal> internal;
+ PropertiesInternal* internal;
protected:
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp?rev=926339&r1=926338&r2=926339&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.cpp Mon Mar 22 21:10:06 2010
@@ -192,13 +192,17 @@ namespace util{
}}
////////////////////////////////////////////////////////////////////////////////
-Timer::Timer() {
- this->internal.reset( new TimerImpl() );
+Timer::Timer() : internal( new TimerImpl() ) {
this->internal->start();
}
////////////////////////////////////////////////////////////////////////////////
Timer::~Timer() {
+ try{
+ delete this->internal;
+ }
+ DECAF_CATCH_NOTHROW( Exception )
+ DECAF_CATCHALL_NOTHROW()
}
////////////////////////////////////////////////////////////////////////////////
@@ -549,7 +553,7 @@ void Timer::scheduleTask( const Pointer<
__FILE__, __LINE__, "Task pointer passed in was Null" );
}
- synchronized( this->internal.get() ) {
+ synchronized( this->internal ) {
if( this->internal->cancelled ) {
throw IllegalStateException(
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.h?rev=926339&r1=926338&r2=926339&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Timer.h Mon Mar 22 21:10:06 2010
@@ -56,7 +56,7 @@ namespace util {
class DECAF_API Timer {
private:
- std::auto_ptr<TimerImpl> internal;
+ TimerImpl* internal;
public: