diff options
| author | Alan Conway <aconway@apache.org> | 2008-03-25 13:34:44 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-03-25 13:34:44 +0000 |
| commit | b449826a61eaa0a754e55ca8143882216a07d7e0 (patch) | |
| tree | 9743d3b8a0f5479260beea3a7b47ac1fd8be1801 /cpp/src/qpid/amqp_0_10 | |
| parent | bb542cee9af73a016360aa2d00addfee0206cad8 (diff) | |
| download | qpid-python-b449826a61eaa0a754e55ca8143882216a07d7e0.tar.gz | |
Fix compile errors/warnings with gcc 4.3
- added missing #includes that were implicitly included via old headers.
- add namespace-qualifiers to fix "changes meaning of name" warnings.
- ./qpid/ptr_map.h:51: fixed "qualified return value" warning.
- use const char* for "conversion from string constant to ‘char*’" warnings
Applied patch from https://issues.apache.org/jira/browse/QPID-869
remove depenency on boost/date_time, causes warnings with gcc 4.3.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@640806 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/amqp_0_10')
| -rw-r--r-- | cpp/src/qpid/amqp_0_10/Frame.h | 1 | ||||
| -rw-r--r-- | cpp/src/qpid/amqp_0_10/Segment.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/amqp_0_10/Frame.h b/cpp/src/qpid/amqp_0_10/Frame.h index 2ae0c75073..f3a99e8004 100644 --- a/cpp/src/qpid/amqp_0_10/Frame.h +++ b/cpp/src/qpid/amqp_0_10/Frame.h @@ -24,6 +24,7 @@ #include "qpid/amqp_0_10/built_in_types.h" #include <boost/shared_array.hpp> +#include <string.h> namespace qpid { namespace amqp_0_10 { diff --git a/cpp/src/qpid/amqp_0_10/Segment.cpp b/cpp/src/qpid/amqp_0_10/Segment.cpp index 0d7c9c55f1..8eebeb276d 100644 --- a/cpp/src/qpid/amqp_0_10/Segment.cpp +++ b/cpp/src/qpid/amqp_0_10/Segment.cpp @@ -29,7 +29,7 @@ namespace amqp_0_10 { Segment::Segment() : missing() {} bool Segment::isComplete() const { - return missing || !frames.empty() && (frames.back().testFlags(Frame::LAST_FRAME)); + return missing || (!frames.empty() && (frames.back().testFlags(Frame::LAST_FRAME))); } Segment::const_iterator Segment::begin() const { |