qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r1162273 - in /qpid/trunk/qpid/cpp: include/qpid/Msg.h src/Makefile.am
Date Fri, 26 Aug 2011 22:16:01 GMT
Author: aconway
Date: Fri Aug 26 22:16:01 2011
New Revision: 1162273

URL: http://svn.apache.org/viewvc?rev=1162273&view=rev
Log:
QPID-3457: qpid::Msg::str() method not exported

Previous fix was incomplete. The class Msg is used by Variant.cpp in the types library.
Moved the Msg class from common to types library.

Modified:
    qpid/trunk/qpid/cpp/include/qpid/Msg.h
    qpid/trunk/qpid/cpp/src/Makefile.am

Modified: qpid/trunk/qpid/cpp/include/qpid/Msg.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/Msg.h?rev=1162273&r1=1162272&r2=1162273&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/Msg.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/Msg.h Fri Aug 26 22:16:01 2011
@@ -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; }

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1162273&r1=1162272&r2=1162273&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Fri Aug 26 22:16:01 2011
@@ -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
 
 libqpidtypes_la_LIBADD= -luuid
 libqpidtypes_la_SOURCES=			\
+  qpid/Msg.cpp					\
   qpid/types/Exception.cpp			\
   qpid/types/Uuid.cpp				\
   qpid/types/Variant.cpp			\



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message