diff options
| author | Gordon Sim <gsim@apache.org> | 2006-12-12 12:57:08 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2006-12-12 12:57:08 +0000 |
| commit | 2970078e8a383be527c6a80c7fdd9b548e3895ca (patch) | |
| tree | 01318fd575492c6010d9c120af02072fbf03bc14 /cpp/lib/common | |
| parent | 42da34c3320485e2e88f5d4169a4f92a48c1eb7a (diff) | |
| download | qpid-python-2970078e8a383be527c6a80c7fdd9b548e3895ca.tar.gz | |
Renamed Content.h (and Content.cpp for consistency) in framing to avoid clashing with existing Content.h file.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486119 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/common')
| -rw-r--r-- | cpp/lib/common/Makefile.am | 4 | ||||
| -rw-r--r-- | cpp/lib/common/framing/Buffer.cpp | 2 | ||||
| -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 |