diff options
| author | Alan Conway <aconway@apache.org> | 2008-06-02 16:10:21 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-06-02 16:10:21 +0000 |
| commit | c3255209803ef77d64a2c94eb33d7e91559c827f (patch) | |
| tree | 130d814e41799770afc71f9b09ac4645b36874df | |
| parent | 40c8b6f844ce64fc4245e5f91e6b1eaea2fc9e94 (diff) | |
| download | qpid-python-c3255209803ef77d64a2c94eb33d7e91559c827f.tar.gz | |
Backed out previous fix compiler for warning, it fails with boost 1.33.
Will seek a fix that works for all versions.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@662472 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/ptr_map.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/src/qpid/ptr_map.h b/cpp/src/qpid/ptr_map.h index f34c3271b3..92da79a2e5 100644 --- a/cpp/src/qpid/ptr_map.h +++ b/cpp/src/qpid/ptr_map.h @@ -25,7 +25,6 @@ #include <boost/ptr_container/ptr_map.hpp> #include <boost/utility/enable_if.hpp> #include <boost/type_traits/is_same.hpp> -#include <boost/type_traits/remove_const.hpp> namespace qpid { @@ -50,10 +49,7 @@ typename boost::enable_if<IsOldPtrMap, typename Iter::value_type*>::type ptr_map_ptr(const Iter& i) { return &*i; } template <class Iter> -struct PtrMapValueType : public boost::remove_const<typename Iter::value_type::second_type> {}; - -template <class Iter> -typename boost::disable_if<IsOldPtrMap, typename PtrMapValueType<Iter>::type >::type +typename boost::disable_if<IsOldPtrMap, typename Iter::value_type::second_type>::type ptr_map_ptr(const Iter& i) { return i->second; } } // namespace qpid |