Author: aconway
Date: Mon Jun 2 09:10:21 2008
New Revision: 662472
URL: http://svn.apache.org/viewvc?rev=662472&view=rev
Log:
Backed out previous fix compiler for warning, it fails with boost 1.33.
Will seek a fix that works for all versions.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/ptr_map.h
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/ptr_map.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/ptr_map.h?rev=662472&r1=662471&r2=662472&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/ptr_map.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/ptr_map.h Mon Jun 2 09:10:21 2008
@@ -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 @@
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
