From 447c941935ae75a91093e5b49f05a40cc188ab60 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Mon, 31 Aug 2009 22:43:29 +0000 Subject: Changes to make messaging API build on Windows: Prepend VAR_ to Variant types enum to avoid name clashes, add 'reference' type for FieldTable ValueMap to satisfy STL, refer to structs as such, not as class (avoids compile warning) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@809772 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/include/qpid/framing/FieldTable.h | 3 ++- cpp/include/qpid/framing/List.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'cpp/include/qpid/framing') diff --git a/cpp/include/qpid/framing/FieldTable.h b/cpp/include/qpid/framing/FieldTable.h index b2331cd4e1..fd09cfc6f6 100644 --- a/cpp/include/qpid/framing/FieldTable.h +++ b/cpp/include/qpid/framing/FieldTable.h @@ -52,6 +52,7 @@ class FieldTable typedef std::map ValueMap; typedef ValueMap::iterator iterator; typedef ValueMap::const_reference const_reference; + typedef ValueMap::reference reference; typedef ValueMap::value_type value_type; QPID_COMMON_EXTERN FieldTable() {}; @@ -108,7 +109,7 @@ class FieldTable ValueMap::iterator find(const std::string& s) { return values.find(s); } std::pair insert(const ValueMap::value_type&); - ValueMap::iterator insert(ValueMap::iterator, const ValueMap::value_type&); + QPID_COMMON_EXTERN ValueMap::iterator insert(ValueMap::iterator, const ValueMap::value_type&); void clear() { values.clear(); } // ### Hack Alert diff --git a/cpp/include/qpid/framing/List.h b/cpp/include/qpid/framing/List.h index cb1129ebf8..0f17c7884c 100644 --- a/cpp/include/qpid/framing/List.h +++ b/cpp/include/qpid/framing/List.h @@ -44,6 +44,7 @@ class List typedef Values::const_iterator const_iterator; typedef Values::iterator iterator; typedef Values::const_reference const_reference; + typedef Values::reference reference; QPID_COMMON_EXTERN uint32_t encodedSize() const; QPID_COMMON_EXTERN void encode(Buffer& buffer) const; -- cgit v1.2.1