diff options
| author | Alan Conway <aconway@apache.org> | 2011-08-26 20:08:41 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-08-26 20:08:41 +0000 |
| commit | 478ded40bb3911eef1f2be480289eb60d74c3e20 (patch) | |
| tree | 196d13c5bca543a9083be7505344286ee3bd640d | |
| parent | dd4133e4616a52420a2fc5929dfca7be85937f14 (diff) | |
| download | qpid-python-478ded40bb3911eef1f2be480289eb60d74c3e20.tar.gz | |
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/qpid@1162233 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/include/qpid/Msg.h | 3 | ||||
| -rw-r--r-- | cpp/src/qpid/types/Variant.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/qpid/Msg.h b/cpp/include/qpid/Msg.h index a4deb15c26..5a55be28db 100644 --- a/cpp/include/qpid/Msg.h +++ b/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/cpp/src/qpid/types/Variant.cpp b/cpp/src/qpid/types/Variant.cpp index 0b28234025..f563d5de5b 100644 --- a/cpp/src/qpid/types/Variant.cpp +++ b/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> |