QMFv2 API change:

  1) Added public constructor for DataAddr(Variant::Map)
  2) Fixed Python and Ruby typemaps to support Variant::Map& and Variant::List& with const
  3) Added support for building Queries based on object-id maps in both Python and Ruby wrappers


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

2 files changed, 2 insertions, 1 deletions

diff --git a/qpid/cpp/src/qmf/DataAddr.cpp b/qpid/cpp/src/qmf/DataAddr.cpp
index c864ac9bf4..fb51d5787f 100644
--- a/qpid/cpp/src/qmf/DataAddr.cpp
+++ b/qpid/cpp/src/qmf/DataAddr.cpp
@@ -38,6 +38,7 @@ DataAddr& DataAddr::operator=(const DataAddr& s) { return PI::assign(*this, s);
 bool DataAddr::operator==(const DataAddr& o) { return *impl == *o.impl; }
 bool DataAddr::operator<(const DataAddr& o) { return *impl < *o.impl; }
 
+DataAddr::DataAddr(const qpid::types::Variant::Map& m) { PI::ctor(*this, new DataAddrImpl(m)); }
 DataAddr::DataAddr(const string& n, const string& a, uint32_t e) { PI::ctor(*this, new DataAddrImpl(n, a, e)); }
 const string& DataAddr::getName() const { return impl->getName(); }
 const string& DataAddr::getAgentName() const { return impl->getAgentName(); }
diff --git a/qpid/cpp/src/qmf/DataAddrImpl.h b/qpid/cpp/src/qmf/DataAddrImpl.h
index 26acd60575..3f9cae9453 100644
--- a/qpid/cpp/src/qmf/DataAddrImpl.h
+++ b/qpid/cpp/src/qmf/DataAddrImpl.h
@@ -32,7 +32,6 @@ namespace qmf {
         //
         // Impl-only methods
         //
-        DataAddrImpl(const qpid::types::Variant::Map&);
         void setName(const std::string& n) { name = n; }
         void setAgent(const std::string& n, uint32_t e=0) { agentName = n; agentEpoch = e; }
 
@@ -41,6 +40,7 @@ namespace qmf {
         //
         bool operator==(const DataAddrImpl&);
         bool operator<(const DataAddrImpl&);
+        DataAddrImpl(const qpid::types::Variant::Map&);
         DataAddrImpl(const std::string& _name, const std::string& _agentName, uint32_t _agentEpoch=0) :
             agentName(_agentName), name(_name), agentEpoch(_agentEpoch) {}
         const std::string& getName() const { return name; }