Author: gsim
Date: Tue Dec 12 04:57:08 2006
New Revision: 486119
URL: http://svn.apache.org/viewvc?view=rev&rev=486119
Log:
Renamed Content.h (and Content.cpp for consistency) in framing to avoid
clashing with existing Content.h file.
Added:
incubator/qpid/trunk/qpid/cpp/lib/common/framing/FramingContent.cpp
- copied, changed from r486051,
incubator/qpid/trunk/qpid/cpp/lib/common/framing/Content.cpp
incubator/qpid/trunk/qpid/cpp/lib/common/framing/FramingContent.h
- copied unchanged from r486051,
incubator/qpid/trunk/qpid/cpp/lib/common/framing/Content.h
Removed:
incubator/qpid/trunk/qpid/cpp/lib/common/framing/Content.cpp
incubator/qpid/trunk/qpid/cpp/lib/common/framing/Content.h
Modified:
incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/common/framing/Buffer.cpp
Modified: incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am?view=diff&rev=486119&r1=486118&r2=486119
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am Tue Dec 12 04:57:08
2006
@@ -71,10 +71,10 @@
$(framing)/BodyHandler.h \
$(framing)/Buffer.cpp \
$(framing)/Buffer.h \
- $(framing)/Content.cpp \
- $(framing)/Content.h \
$(framing)/FieldTable.cpp \
$(framing)/FieldTable.h \
+ $(framing)/FramingContent.cpp \
+ $(framing)/FramingContent.h \
$(framing)/HeaderProperties.h \
$(framing)/InitiationHandler.cpp \
$(framing)/InitiationHandler.h \
Modified: incubator/qpid/trunk/qpid/cpp/lib/common/framing/Buffer.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/framing/Buffer.cpp?view=diff&rev=486119&r1=486118&r2=486119
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/framing/Buffer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/framing/Buffer.cpp Tue Dec 12
04:57:08 2006
@@ -19,7 +19,7 @@
*
*/
#include <Buffer.h>
-#include <Content.h>
+#include <FramingContent.h>
#include <FieldTable.h>
qpid::framing::Buffer::Buffer(u_int32_t _size) : size(_size), owner(true),
position(0), limit(_size){
Copied: incubator/qpid/trunk/qpid/cpp/lib/common/framing/FramingContent.cpp
(from r486051, incubator/qpid/trunk/qpid/cpp/lib/common/framing/Content.cpp)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/framing/FramingContent.cpp?view=diff&rev=486119&p1=incubator/qpid/trunk/qpid/cpp/lib/common/framing/Content.cpp&r1=486051&p2=incubator/qpid/trunk/qpid/cpp/lib/common/framing/FramingContent.cpp&r2=486119
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/framing/Content.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/framing/FramingContent.cpp Tue Dec
12 04:57:08 2006
@@ -19,7 +19,7 @@
*
*/
#include <Buffer.h>
-#include <Content.h>
+#include <FramingContent.h>
namespace qpid
{
