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

6 files changed, 24 insertions, 22 deletions

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<std::string, ValuePtr> 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 <ValueMap::iterator, bool> 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;
diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h
index 5517e45af9..19dae586a4 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/cpp/include/qpid/messaging/Connection.h
@@ -41,7 +41,7 @@ class Session;
 class Connection : public qpid::client::Handle<ConnectionImpl>
 {
   public:
-    static Connection open(const std::string& url, const Variant::Map& options = Variant::Map());
+    static QPID_CLIENT_EXTERN Connection open(const std::string& url, const Variant::Map& options = Variant::Map());
 
     QPID_CLIENT_EXTERN Connection(ConnectionImpl* impl = 0);
     QPID_CLIENT_EXTERN Connection(const Connection&);
diff --git a/cpp/include/qpid/messaging/Message.h b/cpp/include/qpid/messaging/Message.h
index 329388048e..e68d8a1141 100644
--- a/cpp/include/qpid/messaging/Message.h
+++ b/cpp/include/qpid/messaging/Message.h
@@ -33,9 +33,9 @@ namespace client {
 
 namespace messaging {
 
-class Address;
+struct Address;
 class Codec;
-class MessageImpl;
+struct MessageImpl;
 
 /**
  * Representation of a message.
@@ -81,7 +81,7 @@ class Message
 
   private:
     MessageImpl* impl;
-  friend class MessageImplAccess;
+    friend struct MessageImplAccess;
 };
 }} // namespace qpid::messaging
 
diff --git a/cpp/include/qpid/messaging/Session.h b/cpp/include/qpid/messaging/Session.h
index 3a354c009f..1d88882db6 100644
--- a/cpp/include/qpid/messaging/Session.h
+++ b/cpp/include/qpid/messaging/Session.h
@@ -35,8 +35,8 @@ template <class> class PrivateImplRef;
 
 namespace messaging {
 
-class Address;
-class Filter;
+struct Address;
+struct Filter;
 class Message;
 class MessageListener;
 class Sender;
diff --git a/cpp/include/qpid/messaging/Variant.h b/cpp/include/qpid/messaging/Variant.h
index ac000244c2..1e51914794 100644
--- a/cpp/include/qpid/messaging/Variant.h
+++ b/cpp/include/qpid/messaging/Variant.h
@@ -44,21 +44,21 @@ struct InvalidConversion : public qpid::Exception
 };
 
 enum VariantType {
-    VOID = 0,
-    BOOL,
-    UINT8,
-    UINT16,
-    UINT32,
-    UINT64,
-    INT8,
-    INT16,
-    INT32,
-    INT64,
-    FLOAT,
-    DOUBLE,
-    STRING,
-    MAP,
-    LIST
+    VAR_VOID = 0,
+    VAR_BOOL,
+    VAR_UINT8,
+    VAR_UINT16,
+    VAR_UINT32,
+    VAR_UINT64,
+    VAR_INT8,
+    VAR_INT16,
+    VAR_INT32,
+    VAR_INT64,
+    VAR_FLOAT,
+    VAR_DOUBLE,
+    VAR_STRING,
+    VAR_MAP,
+    VAR_LIST
 };
 
 class VariantImpl;