Changes to build DLLs instead of static libs on Windows; primarily added decorators to exported names. Fixes QPID-1673

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

2 files changed, 18 insertions, 16 deletions

diff --git a/cpp/src/qpid/management/Manageable.h b/cpp/src/qpid/management/Manageable.h
index b4d80d8fad..ededa6141e 100644
--- a/cpp/src/qpid/management/Manageable.h
+++ b/cpp/src/qpid/management/Manageable.h
@@ -23,11 +23,12 @@
 #include "ManagementObject.h"
 #include "Args.h"
 #include <string>
+#include "qpid/CommonImportExport.h"
 
 namespace qpid { 
 namespace management {
 
-class Manageable
+class QPID_COMMON_EXTERN Manageable
 {
   public:
 
diff --git a/cpp/src/qpid/management/ManagementObject.h b/cpp/src/qpid/management/ManagementObject.h
index fbdad347b8..498169318d 100644
--- a/cpp/src/qpid/management/ManagementObject.h
+++ b/cpp/src/qpid/management/ManagementObject.h
@@ -25,6 +25,7 @@
 #include "qpid/sys/Time.h"
 #include "qpid/sys/Mutex.h"
 #include <qpid/framing/Buffer.h>
+#include "qpid/CommonImportExport.h"
 #include <map>
 
 namespace qpid { 
@@ -41,7 +42,7 @@ private:
     uint64_t first;
 public:
     AgentAttachment() : first(0) {}
-    void setBanks(uint32_t broker, uint32_t bank);
+    QPID_COMMON_EXTERN void setBanks(uint32_t broker, uint32_t bank);
     uint64_t getFirst() const { return first; }
 };
 
@@ -53,17 +54,17 @@ protected:
     uint64_t second;
     void fromString(const std::string&);
 public:
-    ObjectId() : agent(0), first(0), second(0) {}
-    ObjectId(framing::Buffer& buf) : agent(0) { decode(buf); }
-    ObjectId(uint8_t flags, uint16_t seq, uint32_t broker, uint32_t bank, uint64_t object);
-    ObjectId(AgentAttachment* _agent, uint8_t flags, uint16_t seq, uint64_t object);
-    ObjectId(std::istream&);
-    ObjectId(const std::string&);
-    bool operator==(const ObjectId &other) const;
-    bool operator<(const ObjectId &other) const;
-    void encode(framing::Buffer& buffer);
-    void decode(framing::Buffer& buffer);
-    friend std::ostream& operator<<(std::ostream&, const ObjectId&);
+    QPID_COMMON_EXTERN ObjectId() : agent(0), first(0), second(0) {}
+    QPID_COMMON_EXTERN ObjectId(framing::Buffer& buf) : agent(0) { decode(buf); }
+    QPID_COMMON_EXTERN ObjectId(uint8_t flags, uint16_t seq, uint32_t broker, uint32_t bank, uint64_t object);
+    QPID_COMMON_EXTERN ObjectId(AgentAttachment* _agent, uint8_t flags, uint16_t seq, uint64_t object);
+    QPID_COMMON_EXTERN ObjectId(std::istream&);
+    QPID_COMMON_EXTERN ObjectId(const std::string&);
+    QPID_COMMON_EXTERN bool operator==(const ObjectId &other) const;
+    QPID_COMMON_EXTERN bool operator<(const ObjectId &other) const;
+    QPID_COMMON_EXTERN void encode(framing::Buffer& buffer);
+    QPID_COMMON_EXTERN void decode(framing::Buffer& buffer);
+    friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const ObjectId&);
 };
 
 class ManagementItem {
@@ -128,8 +129,8 @@ class ManagementObject : public ManagementItem
     static int nextThreadIndex;
     bool             forcePublish;
         
-    int  getThreadIndex();
-    void writeTimestamps(qpid::framing::Buffer& buf);
+    QPID_COMMON_EXTERN int  getThreadIndex();
+    QPID_COMMON_EXTERN void writeTimestamps(qpid::framing::Buffer& buf);
 
   public:
     typedef void (*writeSchemaCall_t) (qpid::framing::Buffer&);
@@ -148,7 +149,7 @@ class ManagementObject : public ManagementItem
     virtual void doMethod(std::string&           methodName,
                           qpid::framing::Buffer& inBuf,
                           qpid::framing::Buffer& outBuf) = 0;
-    virtual void setReference(ObjectId objectId);
+    QPID_COMMON_EXTERN virtual void setReference(ObjectId objectId);
 
     virtual std::string& getClassName() const = 0;
     virtual std::string& getPackageName() const = 0;