From b3881a53867688832f3891dbecbde149b0d278db Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Fri, 26 Aug 2011 20:08:41 +0000
Subject: QPID-3457: qpid::Msg::str() method not exported

- Added the QPID_COMMON_EXTERN declaration to Msg.h
- Removed a spurious #include "Msg.h" from qpid/types/Variant.cpp

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1162233 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/include/qpid/Msg.h         | 3 ++-
 qpid/cpp/src/qpid/types/Variant.cpp | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qpid/cpp/include/qpid/Msg.h b/qpid/cpp/include/qpid/Msg.h
index a4deb15c26..5a55be28db 100644
--- a/qpid/cpp/include/qpid/Msg.h
+++ b/qpid/cpp/include/qpid/Msg.h
@@ -24,6 +24,7 @@
 
 #include <sstream>
 #include <iostream>
+#include "qpid/CommonImportExport.h"
 
 namespace qpid {
 
@@ -41,7 +42,7 @@ struct Msg {
     std::ostringstream os;
     Msg() {}
     Msg(const Msg& m) : os(m.str()) {}
-    std::string str() const;
+    QPID_COMMON_EXTERN std::string str() const;
     operator std::string() const { return str(); }
 
     Msg& operator<<(long n) { os << n; return *this; }
diff --git a/qpid/cpp/src/qpid/types/Variant.cpp b/qpid/cpp/src/qpid/types/Variant.cpp
index 0b28234025..f563d5de5b 100644
--- a/qpid/cpp/src/qpid/types/Variant.cpp
+++ b/qpid/cpp/src/qpid/types/Variant.cpp
@@ -19,7 +19,6 @@
  *
  */
 #include "qpid/types/Variant.h"
-#include "qpid/Msg.h"
 #include "qpid/log/Statement.h"
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
-- 
cgit v1.2.1