summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qpid/cpp/include/qpid/Msg.h4
-rw-r--r--qpid/cpp/src/Makefile.am2
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/include/qpid/Msg.h b/qpid/cpp/include/qpid/Msg.h
index 5a55be28db..7a39a41c8d 100644
--- a/qpid/cpp/include/qpid/Msg.h
+++ b/qpid/cpp/include/qpid/Msg.h
@@ -24,7 +24,7 @@
#include <sstream>
#include <iostream>
-#include "qpid/CommonImportExport.h"
+#include "qpid/types/ImportExport.h"
namespace qpid {
@@ -42,7 +42,7 @@ struct Msg {
std::ostringstream os;
Msg() {}
Msg(const Msg& m) : os(m.str()) {}
- QPID_COMMON_EXTERN std::string str() const;
+ QPID_TYPES_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/Makefile.am b/qpid/cpp/src/Makefile.am
index e502000758..9171caed1e 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -435,7 +435,6 @@ libqpidcommon_la_SOURCES += \
qpid/log/OstreamOutput.h \
qpid/log/Selector.cpp \
qpid/log/Statement.cpp \
- qpid/Msg.cpp \
qpid/management/Buffer.cpp \
qpid/management/ConnectionSettings.cpp \
qpid/management/Manageable.cpp \
@@ -745,6 +744,7 @@ libqpidclient_la_LDFLAGS = -version-info $(QPIDCLIENT_VERSION_INFO)
libqpidtypes_la_LIBADD= -luuid
libqpidtypes_la_SOURCES= \
+ qpid/Msg.cpp \
qpid/types/Exception.cpp \
qpid/types/Uuid.cpp \
qpid/types/Variant.cpp \