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/ptr_map.h | |
| 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/ptr_map.h')
| -rw-r--r-- | cpp/src/qpid/ptr_map.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/qpid/ptr_map.h b/cpp/src/qpid/ptr_map.h index c33f63767d..e9a1d507a6 100644 --- a/cpp/src/qpid/ptr_map.h +++ b/cpp/src/qpid/ptr_map.h @@ -39,6 +39,9 @@ namespace ptr_map { * * @see http://www.boost.org/libs/ptr_container/doc/ptr_container.html#upgrading-from-boost-v-1-33 */ + +#include <boost/type_traits/remove_const.hpp> + #if (BOOST_VERSION < 103400) template <class PtrMapIter> @@ -48,7 +51,8 @@ typename PtrMapIter::pointer get_pointer(const PtrMapIter& i) #else template <class PtrMapIter> -typename PtrMapIter::value_type::second_type get_pointer(const PtrMapIter& i) +typename boost::remove_const<typename PtrMapIter::value_type::second_type>::type +get_pointer(const PtrMapIter& i) { return i->second; } #endif |