3 files changed, 34 insertions, 31 deletions
diff --git a/qpid/cpp/src/qpid/amqp/DataBuilder.h b/qpid/cpp/src/qpid/amqp/DataBuilder.h
index 672584d73d..9876a625b1 100644
--- a/qpid/cpp/src/qpid/amqp/DataBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/DataBuilder.h
@@ -23,6 +23,7 @@
  */
 #include "Reader.h"
 #include "qpid/types/Variant.h"
+#include "qpid/CommonImportExport.h"
 #include <stack>
 
 namespace qpid {
@@ -34,36 +35,36 @@ namespace amqp {
 class DataBuilder : public Reader
 {
   public:
-    DataBuilder(qpid::types::Variant);
-    virtual ~DataBuilder();
-    void onNull(const Descriptor*);
-    void onBoolean(bool, const Descriptor*);
-    void onUByte(uint8_t, const Descriptor*);
-    void onUShort(uint16_t, const Descriptor*);
-    void onUInt(uint32_t, const Descriptor*);
-    void onULong(uint64_t, const Descriptor*);
-    void onByte(int8_t, const Descriptor*);
-    void onShort(int16_t, const Descriptor*);
-    void onInt(int32_t, const Descriptor*);
-    void onLong(int64_t, const Descriptor*);
-    void onFloat(float, const Descriptor*);
-    void onDouble(double, const Descriptor*);
-    void onUuid(const CharSequence&, const Descriptor*);
-    void onTimestamp(int64_t, const Descriptor*);
+    QPID_COMMON_EXTERN DataBuilder(qpid::types::Variant);
+    QPID_COMMON_EXTERN virtual ~DataBuilder();
+    QPID_COMMON_EXTERN void onNull(const Descriptor*);
+    QPID_COMMON_EXTERN void onBoolean(bool, const Descriptor*);
+    QPID_COMMON_EXTERN void onUByte(uint8_t, const Descriptor*);
+    QPID_COMMON_EXTERN void onUShort(uint16_t, const Descriptor*);
+    QPID_COMMON_EXTERN void onUInt(uint32_t, const Descriptor*);
+    QPID_COMMON_EXTERN void onULong(uint64_t, const Descriptor*);
+    QPID_COMMON_EXTERN void onByte(int8_t, const Descriptor*);
+    QPID_COMMON_EXTERN void onShort(int16_t, const Descriptor*);
+    QPID_COMMON_EXTERN void onInt(int32_t, const Descriptor*);
+    QPID_COMMON_EXTERN void onLong(int64_t, const Descriptor*);
+    QPID_COMMON_EXTERN void onFloat(float, const Descriptor*);
+    QPID_COMMON_EXTERN void onDouble(double, const Descriptor*);
+    QPID_COMMON_EXTERN void onUuid(const CharSequence&, const Descriptor*);
+    QPID_COMMON_EXTERN void onTimestamp(int64_t, const Descriptor*);
 
-    void onBinary(const CharSequence&, const Descriptor*);
-    void onString(const CharSequence&, const Descriptor*);
-    void onSymbol(const CharSequence&, const Descriptor*);
+    QPID_COMMON_EXTERN void onBinary(const CharSequence&, const Descriptor*);
+    QPID_COMMON_EXTERN void onString(const CharSequence&, const Descriptor*);
+    QPID_COMMON_EXTERN void onSymbol(const CharSequence&, const Descriptor*);
 
-    bool onStartList(uint32_t /*count*/, const CharSequence&, const Descriptor*);
-    bool onStartMap(uint32_t /*count*/, const CharSequence&, const Descriptor*);
-    bool onStartArray(uint32_t /*count*/, const CharSequence&, const Constructor&, const Descriptor*);
-    void onEndList(uint32_t /*count*/, const Descriptor*);
-    void onEndMap(uint32_t /*count*/, const Descriptor*);
-    void onEndArray(uint32_t /*count*/, const Descriptor*);
+    QPID_COMMON_EXTERN bool onStartList(uint32_t /*count*/, const CharSequence&, const Descriptor*);
+    QPID_COMMON_EXTERN bool onStartMap(uint32_t /*count*/, const CharSequence&, const Descriptor*);
+    QPID_COMMON_EXTERN bool onStartArray(uint32_t /*count*/, const CharSequence&, const Constructor&, const Descriptor*);
+    QPID_COMMON_EXTERN void onEndList(uint32_t /*count*/, const Descriptor*);
+    QPID_COMMON_EXTERN void onEndMap(uint32_t /*count*/, const Descriptor*);
+    QPID_COMMON_EXTERN void onEndArray(uint32_t /*count*/, const Descriptor*);
 
-    bool proceed();
-    qpid::types::Variant& getValue();
+    QPID_COMMON_EXTERN bool proceed();
+    QPID_COMMON_EXTERN qpid::types::Variant& getValue();
   private:
     qpid::types::Variant base;
     std::stack<qpid::types::Variant*> nested;
diff --git a/qpid/cpp/src/qpid/amqp/ListBuilder.h b/qpid/cpp/src/qpid/amqp/ListBuilder.h
index ee6af62539..825f384f56 100644
--- a/qpid/cpp/src/qpid/amqp/ListBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/ListBuilder.h
@@ -22,6 +22,7 @@
  *
  */
 #include "DataBuilder.h"
+#include "qpid/CommonImportExport.h"
 
 namespace qpid {
 namespace amqp {
@@ -32,8 +33,8 @@ namespace amqp {
 class ListBuilder : public DataBuilder
 {
   public:
-    ListBuilder();
-    qpid::types::Variant::List& getList();
+    QPID_COMMON_EXTERN ListBuilder();
+    QPID_COMMON_EXTERN qpid::types::Variant::List& getList();
 };
 }} // namespace qpid::amqp
 
diff --git a/qpid/cpp/src/qpid/amqp/MapBuilder.h b/qpid/cpp/src/qpid/amqp/MapBuilder.h
index 500d2e6db3..fd94ae04af 100644
--- a/qpid/cpp/src/qpid/amqp/MapBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/MapBuilder.h
@@ -22,6 +22,7 @@
  *
  */
 #include "DataBuilder.h"
+#include "qpid/CommonImportExport.h"
 
 namespace qpid {
 namespace amqp {
@@ -32,8 +33,8 @@ namespace amqp {
 class MapBuilder : public DataBuilder
 {
   public:
-    MapBuilder();
-    qpid::types::Variant::Map getMap();
+    QPID_COMMON_EXTERN MapBuilder();
+    QPID_COMMON_EXTERN qpid::types::Variant::Map getMap();
 };
 }} // namespace qpid::amqp