diff options
| author | Gordon Sim <gsim@apache.org> | 2010-03-29 16:00:24 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-03-29 16:00:24 +0000 |
| commit | c2b13417889ca05c880736e49bba91fb1ba4bd5d (patch) | |
| tree | ea72ec14078104b05fba67b36eeabaa7654bc046 /cpp/include/qpid/messaging/Address.h | |
| parent | 5913593d7605f97535a4dc66ea9b39d46c64a142 (diff) | |
| download | qpid-python-c2b13417889ca05c880736e49bba91fb1ba4bd5d.tar.gz | |
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
Diffstat (limited to 'cpp/include/qpid/messaging/Address.h')
| -rw-r--r-- | cpp/include/qpid/messaging/Address.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/include/qpid/messaging/Address.h b/cpp/include/qpid/messaging/Address.h index fd790a613c..307e0cfa8d 100644 --- a/cpp/include/qpid/messaging/Address.h +++ b/cpp/include/qpid/messaging/Address.h @@ -23,7 +23,7 @@ */ #include <string> #include "qpid/Exception.h" -#include "qpid/messaging/Variant.h" +#include "qpid/types/Variant.h" #include "qpid/messaging/ImportExport.h" #include <ostream> @@ -124,7 +124,7 @@ class Address QPID_CLIENT_EXTERN Address(); QPID_CLIENT_EXTERN Address(const std::string& address); QPID_CLIENT_EXTERN Address(const std::string& name, const std::string& subject, - const Variant::Map& options, const std::string& type = ""); + const qpid::types::Variant::Map& options, const std::string& type = ""); QPID_CLIENT_EXTERN Address(const Address& address); QPID_CLIENT_EXTERN ~Address(); QPID_CLIENT_EXTERN Address& operator=(const Address&); @@ -133,14 +133,14 @@ class Address QPID_CLIENT_EXTERN const std::string& getSubject() const; QPID_CLIENT_EXTERN void setSubject(const std::string&); QPID_CLIENT_EXTERN bool hasSubject() const; - QPID_CLIENT_EXTERN const Variant::Map& getOptions() const; - QPID_CLIENT_EXTERN Variant::Map& getOptions(); - QPID_CLIENT_EXTERN void setOptions(const Variant::Map&); + QPID_CLIENT_EXTERN const qpid::types::Variant::Map& getOptions() const; + QPID_CLIENT_EXTERN qpid::types::Variant::Map& getOptions(); + QPID_CLIENT_EXTERN void setOptions(const qpid::types::Variant::Map&); QPID_CLIENT_EXTERN std::string getType() const; QPID_CLIENT_EXTERN void setType(const std::string&); - QPID_CLIENT_EXTERN const Variant& getOption(const std::string& key) const; + QPID_CLIENT_EXTERN const qpid::types::Variant& getOption(const std::string& key) const; QPID_CLIENT_EXTERN std::string toStr() const; QPID_CLIENT_EXTERN operator bool() const; |