QPID-664: move Variant and Uuid from messaging to types namespace

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@928814 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 20 insertions, 23 deletions

diff --git a/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
index 9f2d4eef78..990b2a19d8 100644
--- a/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
+++ b/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
@@ -26,7 +26,7 @@
 #include "qpid/client/amqp0_10/OutgoingMessage.h"
 #include "qpid/messaging/Address.h"
 #include "qpid/messaging/Message.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
 #include "qpid/Exception.h"
 #include "qpid/log/Statement.h"
 #include "qpid/framing/enum.h"
@@ -47,13 +47,13 @@ namespace amqp0_10 {
 using qpid::Exception;
 using qpid::messaging::Address;
 using qpid::messaging::InvalidAddress;
-using qpid::messaging::Variant;
 using qpid::framing::ExchangeBoundResult;
 using qpid::framing::ExchangeQueryResult;
 using qpid::framing::FieldTable;
 using qpid::framing::QueueQueryResult;
 using qpid::framing::ReplyTo;
 using qpid::framing::Uuid;
+using namespace qpid::types;
 using namespace qpid::framing::message;
 using namespace boost::assign;
 
@@ -278,7 +278,7 @@ const Variant& getOption(const Variant::Map& options, const std::vector<std::str
     if (j == options.end()) {
         return EMPTY_VARIANT;
     } else if (++index < path.size()) {
-        if (j->second.getType() != qpid::messaging::VAR_MAP) 
+        if (j->second.getType() != VAR_MAP) 
             throw InvalidAddress((boost::format("Expected %1% to be a map") % j->first).str());
         return getOption(j->second.asMap(), path, index);
     } else {
@@ -326,7 +326,7 @@ Opt& Opt::operator/(const std::string& name)
             options = 0;
         } else {
             value = &(j->second);
-            if (value->getType() == qpid::messaging::VAR_MAP) options = &(value->asMap());
+            if (value->getType() == VAR_MAP) options = &(value->asMap());
             else options = 0;
         }
     }
diff --git a/cpp/src/qpid/client/amqp0_10/AddressResolution.h b/cpp/src/qpid/client/amqp0_10/AddressResolution.h
index 5b81b06131..fc8f1a1d18 100644
--- a/cpp/src/qpid/client/amqp0_10/AddressResolution.h
+++ b/cpp/src/qpid/client/amqp0_10/AddressResolution.h
@@ -21,7 +21,6 @@
  * under the License.
  *
  */
-#include "qpid/messaging/Variant.h"
 #include "qpid/client/Session.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/client/amqp0_10/Codecs.cpp b/cpp/src/qpid/client/amqp0_10/Codecs.cpp
index 3e17fc968b..ce806572e5 100644
--- a/cpp/src/qpid/client/amqp0_10/Codecs.cpp
+++ b/cpp/src/qpid/client/amqp0_10/Codecs.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include "qpid/client/amqp0_10/Codecs.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
 #include "qpid/framing/Array.h"
 #include "qpid/framing/Buffer.h"
 #include "qpid/framing/FieldTable.h"
@@ -32,6 +32,7 @@
 
 using namespace qpid::framing;
 using namespace qpid::messaging;
+using namespace qpid::types;
 
 namespace qpid {
 namespace client {
@@ -115,11 +116,11 @@ void setEncodingFor(Variant& out, uint8_t code)
     }
 }
 
-qpid::messaging::Uuid getUuid(FieldValue& value)
+qpid::types::Uuid getUuid(FieldValue& value)
 {
     unsigned char data[16];
     value.getFixedWidthValue<16>(data);
-    return qpid::messaging::Uuid(data);
+    return qpid::types::Uuid(data);
 }
 
 Variant toVariant(boost::shared_ptr<FieldValue> in)
diff --git a/cpp/src/qpid/client/amqp0_10/CodecsInternal.h b/cpp/src/qpid/client/amqp0_10/CodecsInternal.h
index b5a561a9c3..a110d80b8a 100644
--- a/cpp/src/qpid/client/amqp0_10/CodecsInternal.h
+++ b/cpp/src/qpid/client/amqp0_10/CodecsInternal.h
@@ -21,7 +21,7 @@
  * under the License.
  *
  */
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
 #include "qpid/framing/FieldTable.h"
 
 namespace qpid {
@@ -33,8 +33,8 @@ namespace amqp0_10 {
  * Codecs.cpp but not exposed through API
  */
 
-void translate(const qpid::messaging::Variant::Map& from, qpid::framing::FieldTable& to);
-void translate(const qpid::framing::FieldTable& from, qpid::messaging::Variant::Map& to);
+void translate(const qpid::types::Variant::Map& from, qpid::framing::FieldTable& to);
+void translate(const qpid::framing::FieldTable& from, qpid::types::Variant::Map& to);
 
 }}} // namespace qpid::client::amqp0_10
 
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
index ce4e1ecc2a..ee044aaf2b 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
@@ -32,7 +32,8 @@ namespace qpid {
 namespace client {
 namespace amqp0_10 {
 
-using qpid::messaging::Variant;
+using qpid::types::Variant;
+using qpid::types::VAR_LIST;
 using qpid::framing::Uuid;
 
 void convert(const Variant::List& from, std::vector<std::string>& to)
@@ -62,7 +63,7 @@ bool setIfFound< std::vector<std::string> >(const Variant::Map& map,
 {
     Variant::Map::const_iterator i = map.find(key);
     if (i != map.end()) {
-        if (i->second.getType() == qpid::messaging::VAR_LIST) {
+        if (i->second.getType() == VAR_LIST) {
             convert(i->second.asList(), value);
         } else {
             value.push_back(i->second.asString());
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
index 37a78b2373..2c59d8add8 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
+++ b/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
@@ -22,7 +22,7 @@
  *
  */
 #include "qpid/messaging/ConnectionImpl.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
 #include "qpid/Url.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/ConnectionSettings.h"
@@ -39,14 +39,14 @@ class SessionImpl;
 class ConnectionImpl : public qpid::messaging::ConnectionImpl
 {
   public:
-    ConnectionImpl(const qpid::messaging::Variant::Map& options);
+    ConnectionImpl(const qpid::types::Variant::Map& options);
     void open(const std::string& url);
     void close();
     qpid::messaging::Session newSession(bool transactional, const std::string& name);
     qpid::messaging::Session getSession(const std::string& name) const;
     void closed(SessionImpl&);
     void connect();
-    void setOption(const std::string& name, const qpid::messaging::Variant& value);
+    void setOption(const std::string& name, const qpid::types::Variant& value);
   private:
     typedef std::map<std::string, qpid::messaging::Session> Sessions;
 
@@ -63,7 +63,7 @@ class ConnectionImpl : public qpid::messaging::ConnectionImpl
     int64_t maxReconnectInterval;
     int32_t retries;
 
-    void setOptions(const qpid::messaging::Variant::Map& options);
+    void setOptions(const qpid::types::Variant::Map& options);
     void connect(const qpid::sys::AbsTime& started);
     bool tryConnect();
     bool tryConnect(const std::vector<std::string>& urls);
diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
index 669ffd7e9a..8e501511e4 100644
--- a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
+++ b/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
@@ -28,7 +28,7 @@
 #include "qpid/messaging/Address.h"
 #include "qpid/messaging/Message.h"
 #include "qpid/messaging/MessageImpl.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
 #include "qpid/framing/DeliveryProperties.h"
 #include "qpid/framing/FrameSet.h"
 #include "qpid/framing/MessageProperties.h"
@@ -44,7 +44,7 @@ using namespace qpid::framing::message;
 using qpid::sys::AbsTime;
 using qpid::sys::Duration;
 using qpid::messaging::MessageImplAccess;
-using qpid::messaging::Variant;
+using qpid::types::Variant;
 
 namespace {
 const std::string EMPTY_STRING;
diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h b/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
index 689a7f6f25..d509490688 100644
--- a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
+++ b/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
@@ -24,7 +24,6 @@
 #include "qpid/messaging/Address.h"
 #include "qpid/messaging/Message.h"
 #include "qpid/messaging/ReceiverImpl.h"
-#include "qpid/messaging/Variant.h"
 #include "qpid/client/AsyncSession.h"
 #include "qpid/client/amqp0_10/SessionImpl.h"
 #include "qpid/messaging/Duration.h"
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.h b/cpp/src/qpid/client/amqp0_10/SenderImpl.h
index 9e4181f42f..a99d4bd294 100644
--- a/cpp/src/qpid/client/amqp0_10/SenderImpl.h
+++ b/cpp/src/qpid/client/amqp0_10/SenderImpl.h
@@ -24,7 +24,6 @@
 #include "qpid/messaging/Address.h"
 #include "qpid/messaging/Message.h"
 #include "qpid/messaging/SenderImpl.h"
-#include "qpid/messaging/Variant.h"
 #include "qpid/client/AsyncSession.h"
 #include "qpid/client/amqp0_10/SessionImpl.h"
 #include <memory>
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
index 65308dd0be..245ec878be 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
@@ -43,7 +43,6 @@ using qpid::messaging::KeyError;
 using qpid::messaging::MessageImplAccess;
 using qpid::messaging::Sender;
 using qpid::messaging::Receiver;
-using qpid::messaging::VariantMap;
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.h b/cpp/src/qpid/client/amqp0_10/SessionImpl.h
index a7eaae3cdd..a616db6239 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.h
+++ b/cpp/src/qpid/client/amqp0_10/SessionImpl.h
@@ -23,7 +23,6 @@
  */
 #include "qpid/messaging/SessionImpl.h"
 #include "qpid/messaging/Duration.h"
-#include "qpid/messaging/Variant.h"
 #include "qpid/client/Session.h"
 #include "qpid/client/SubscriptionManager.h"
 #include "qpid/client/amqp0_10/AddressResolution.h"