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/MapContent.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/MapContent.h')
| -rw-r--r-- | cpp/include/qpid/messaging/MapContent.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cpp/include/qpid/messaging/MapContent.h b/cpp/include/qpid/messaging/MapContent.h index 78ef51e593..863eaed786 100644 --- a/cpp/include/qpid/messaging/MapContent.h +++ b/cpp/include/qpid/messaging/MapContent.h @@ -23,7 +23,7 @@ */ #include "qpid/messaging/ImportExport.h" -#include "Variant.h" +#include "qpid/types/Variant.h" #include <map> #include <string> @@ -40,14 +40,14 @@ class MapContent { public: typedef std::string key_type; - typedef std::pair<std::string, Variant> value_type; - typedef std::map<key_type, Variant>::const_iterator const_iterator; - typedef std::map<key_type, Variant>::iterator iterator; - typedef std::map<key_type, Variant>::const_reverse_iterator const_reverse_iterator; - typedef std::map<key_type, Variant>::reverse_iterator reverse_iterator; + typedef std::pair<std::string, qpid::types::Variant> value_type; + typedef std::map<key_type, qpid::types::Variant>::const_iterator const_iterator; + typedef std::map<key_type, qpid::types::Variant>::iterator iterator; + typedef std::map<key_type, qpid::types::Variant>::const_reverse_iterator const_reverse_iterator; + typedef std::map<key_type, qpid::types::Variant>::reverse_iterator reverse_iterator; QPID_CLIENT_EXTERN MapContent(Message&); - QPID_CLIENT_EXTERN MapContent(Message&, const Variant::Map&); + QPID_CLIENT_EXTERN MapContent(Message&, const qpid::types::Variant::Map&); QPID_CLIENT_EXTERN ~MapContent(); QPID_CLIENT_EXTERN const_iterator begin() const; @@ -64,8 +64,8 @@ class MapContent QPID_CLIENT_EXTERN const_iterator find(const key_type&) const; QPID_CLIENT_EXTERN iterator find(const key_type&); - QPID_CLIENT_EXTERN const Variant& operator[](const key_type&) const; - QPID_CLIENT_EXTERN Variant& operator[](const key_type&); + QPID_CLIENT_EXTERN const qpid::types::Variant& operator[](const key_type&) const; + QPID_CLIENT_EXTERN qpid::types::Variant& operator[](const key_type&); QPID_CLIENT_EXTERN std::pair<iterator,bool> insert(const value_type&); QPID_CLIENT_EXTERN iterator insert(iterator position, const value_type&); @@ -76,8 +76,8 @@ class MapContent QPID_CLIENT_EXTERN void encode(); - QPID_CLIENT_EXTERN const std::map<key_type, Variant>& asMap() const; - QPID_CLIENT_EXTERN std::map<key_type, Variant>& asMap(); + QPID_CLIENT_EXTERN const std::map<key_type, qpid::types::Variant>& asMap() const; + QPID_CLIENT_EXTERN std::map<key_type, qpid::types::Variant>& asMap(); private: MapContentImpl* impl; |