From 1322ce3cf402f3bb74c2a411dcbdfd3779ed6d3b Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 2 Jun 2008 17:48:18 +0000
Subject: Fix that works on 1.33/gcc4.1 up to boost 1.34.13/gcc 4.3

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@662497 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/ptr_map.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'cpp/src/qpid')

diff --git a/cpp/src/qpid/ptr_map.h b/cpp/src/qpid/ptr_map.h
index 92da79a2e5..6ffcd48e89 100644
--- a/cpp/src/qpid/ptr_map.h
+++ b/cpp/src/qpid/ptr_map.h
@@ -25,6 +25,7 @@
 #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 {
 
@@ -35,21 +36,20 @@ namespace qpid {
  * iterators should use ptr_map_ptr(i) to get the pointer from
  * boost::ptr_map::iterator i.
  *
- * Can be removed when we no longer support platforms on 1.33.
- *
  * @see http://www.boost.org/libs/ptr_container/doc/ptr_container.html#upgrading-from-boost-v-1-33
  */
 
 
-typedef boost::is_same<boost::ptr_map<int, int>::iterator::value_type,
-                       int> IsOldPtrMap;
+typedef boost::is_same<boost::ptr_map<int, int>::iterator::value_type, int> IsOldPtrMap;
 
 template <class Iter>
 typename boost::enable_if<IsOldPtrMap, typename Iter::value_type*>::type
 ptr_map_ptr(const Iter& i) { return &*i; }
 
 template <class Iter>
-typename boost::disable_if<IsOldPtrMap, typename Iter::value_type::second_type>::type
+typename boost::disable_if<IsOldPtrMap,
+                           typename boost::remove_const<typename Iter::value_type::second_type>::type
+                           >::type
 ptr_map_ptr(const Iter& i) { return i->second; }
 
 } // namespace qpid
-- 
cgit v1.2.1