summaryrefslogtreecommitdiff
path: root/cpp/lib
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/lib')
-rw-r--r--cpp/lib/common/Makefile.am4
-rw-r--r--cpp/lib/common/framing/Buffer.cpp2
-rw-r--r--cpp/lib/common/framing/FramingContent.cpp (renamed from cpp/lib/common/framing/Content.cpp)2
-rw-r--r--cpp/lib/common/framing/FramingContent.h (renamed from cpp/lib/common/framing/Content.h)0
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am
index 21eaf12ff2..6f21a332d4 100644
--- a/cpp/lib/common/Makefile.am
+++ b/cpp/lib/common/Makefile.am
@@ -71,10 +71,10 @@ libcommon_la_SOURCES = \
$(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 \
diff --git a/cpp/lib/common/framing/Buffer.cpp b/cpp/lib/common/framing/Buffer.cpp
index 77b000193a..43815c2f1d 100644
--- a/cpp/lib/common/framing/Buffer.cpp
+++ b/cpp/lib/common/framing/Buffer.cpp
@@ -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){
diff --git a/cpp/lib/common/framing/Content.cpp b/cpp/lib/common/framing/FramingContent.cpp
index cd8e144906..e5f50b5075 100644
--- a/cpp/lib/common/framing/Content.cpp
+++ b/cpp/lib/common/framing/FramingContent.cpp
@@ -19,7 +19,7 @@
*
*/
#include <Buffer.h>
-#include <Content.h>
+#include <FramingContent.h>
namespace qpid
{
diff --git a/cpp/lib/common/framing/Content.h b/cpp/lib/common/framing/FramingContent.h
index 1ab3ba468b..1ab3ba468b 100644
--- a/cpp/lib/common/framing/Content.h
+++ b/cpp/lib/common/framing/FramingContent.h