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/framing | |
| 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/framing')
| -rw-r--r-- | cpp/src/qpid/framing/Buffer.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/framing/Invoker.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/framing/Buffer.cpp b/cpp/src/qpid/framing/Buffer.cpp index 60d67f1b07..81f3456ce1 100644 --- a/cpp/src/qpid/framing/Buffer.cpp +++ b/cpp/src/qpid/framing/Buffer.cpp @@ -21,7 +21,7 @@ #include "Buffer.h" #include "FramingContent.h" #include "FieldTable.h" - +#include <string.h> namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/Invoker.h b/cpp/src/qpid/framing/Invoker.h index e6467ab3c4..6c2b972c13 100644 --- a/cpp/src/qpid/framing/Invoker.h +++ b/cpp/src/qpid/framing/Invoker.h @@ -42,7 +42,7 @@ class Invoker: public MethodBodyDefaultVisitor, protected StructHelper public: Result() : handled(false) {} const std::string& getResult() const { return result; } - const bool hasResult() const { return !result.empty(); } + bool hasResult() const { return !result.empty(); } bool wasHandled() const { return handled; } operator bool() const { return handled; } |