diff options
Diffstat (limited to 'boost/multi_index/identity.hpp')
| -rw-r--r-- | boost/multi_index/identity.hpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/boost/multi_index/identity.hpp b/boost/multi_index/identity.hpp index b402ad70d0..1dbaf3b220 100644 --- a/boost/multi_index/identity.hpp +++ b/boost/multi_index/identity.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_IDENTITY_HPP #define BOOST_MULTI_INDEX_IDENTITY_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -42,16 +42,6 @@ namespace detail{ * arbitrary combinations of these (vg. Type** or auto_ptr<Type*>.) */ -/* NB. Some overloads of operator() have an extra dummy parameter int=0. - * This disambiguator serves several purposes: - * - Without it, MSVC++ 6.0 incorrectly regards some overloads as - * specializations of a previous member function template. - * - MSVC++ 6.0/7.0 seem to incorrectly treat some different memfuns - * as if they have the same signature. - * - If remove_const is broken due to lack of PTS, int=0 avoids the - * declaration of memfuns with identical signature. - */ - template<typename Type> struct const_identity_base { @@ -81,7 +71,7 @@ struct const_identity_base } Type& operator()( - const reference_wrapper<typename remove_const<Type>::type>& x,int=0)const + const reference_wrapper<typename remove_const<Type>::type>& x)const { return x.get(); } @@ -108,7 +98,7 @@ struct non_const_identity_base return operator()(*x); } - const Type& operator()(const Type& x,int=0)const + const Type& operator()(const Type& x)const { return x; } @@ -118,7 +108,7 @@ struct non_const_identity_base return x; } - const Type& operator()(const reference_wrapper<const Type>& x,int=0)const + const Type& operator()(const reference_wrapper<const Type>& x)const { return x.get(); } |