Author: tabish
Date: Mon Aug 16 14:42:44 2010
New Revision: 985972
URL: http://svn.apache.org/viewvc?rev=985972&view=rev
Log:
fix for: https://issues.apache.org/activemq/browse/AMQCPP-310
Ensure that the static inits aren't ambiguous wrt the
activemq::commands::Message class.
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.cpp?rev=985972&r1=985971&r2=985972&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.cpp Mon Aug
16 14:42:44 2010
@@ -19,10 +19,16 @@
#include <cms/DeliveryMode.h>
-using namespace cms;
+namespace cms {
////////////////////////////////////////////////////////////////////////////////
const int Message::DEFAULT_DELIVERY_MODE = cms::DeliveryMode::PERSISTENT;
const int Message::DEFAULT_MSG_PRIORITY = 4;
const long long Message::DEFAULT_TIME_TO_LIVE = 0;
+////////////////////////////////////////////////////////////////////////////////
+Message::~Message() {
+
+}
+
+}
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h?rev=985972&r1=985971&r2=985972&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h Mon Aug 16
14:42:44 2010
@@ -105,7 +105,7 @@ namespace cms{
public:
- virtual ~Message() throw() {}
+ virtual ~Message();
/**
* Clone this message exactly, returns a new instance that the
