You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2007/08/20 02:41:51 UTC
svn commit: r567515 - in /incubator/qpid/trunk/qpid: ./ cpp/src/Makefile.am
cpp/src/qpid/framing/AMQContentBody.h
Author: astitcher
Date: Sun Aug 19 17:41:50 2007
New Revision: 567515
URL: http://svn.apache.org/viewvc?rev=567515&view=rev
Log:
r1036@fuschia: andrew | 2007-08-20 01:41:12 +0100
Small fixes to allow code to compile
Modified:
incubator/qpid/trunk/qpid/ (props changed)
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h
Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Aug 19 17:41:50 2007
@@ -1,3 +1,3 @@
8427bd24-ae5a-4eba-a324-d2fc9c9c6c77:/local/qpid.0-9.ams:1224
c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid-trunk:947
-c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid/trunk/qpid:952
+c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid/trunk/qpid:1036
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=567515&r1=567514&r2=567515&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Sun Aug 19 17:41:50 2007
@@ -52,7 +52,7 @@
qpid/framing/MethodHolderMaxSize.h: generate_MethodHolderMaxSize_h
./generate_MethodHolderMaxSize_h
BUILT_SOURCES=qpid/framing/MethodHolderMaxSize.h
-DISTCLEANFILES=qpid/framing/MethodHolderMaxSize.h
+DISTCLEANFILES+=qpid/framing/MethodHolderMaxSize.h
## Compiler flags
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h?rev=567515&r1=567514&r2=567515&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h Sun Aug 19 17:41:50 2007
@@ -37,7 +37,7 @@
AMQContentBody(const string& data);
inline virtual ~AMQContentBody(){}
inline uint8_t type() const { return CONTENT_BODY; };
- inline string& getData(){ return data; }
+ inline const string& getData() const { return data; }
uint32_t size() const;
void encode(Buffer& buffer) const;
void decode(Buffer& buffer, uint32_t size);