Imported Upstream version 1.57.0

[platform/upstream/boost.git] / boost / multi_index / member.hpp

diff --git a/boost/multi_index/member.hpp b/boost/multi_index/member.hpp
index 848e9b2..192cf1b 100644 (file)
--- a/boost/multi_index/member.hpp
+++ b/boost/multi_index/member.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_MEMBER_HPP
 #define BOOST_MULTI_INDEX_MEMBER_HPP
 
-#if defined(_MSC_VER)&&(_MSC_VER>=1200)
+#if defined(_MSC_VER)
 #pragma once
 #endif
 
@@ -41,16 +41,6 @@ namespace detail{
  * arbitrary combinations of these (vg. T** or auto_ptr<T*>.)
  */
 
-/* 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<class Class,typename Type,Type Class::*PtrToMember>
 struct const_member_base
 {
@@ -80,7 +70,7 @@ struct const_member_base
     return operator()(x.get());
   }
 
-  Type& operator()(const reference_wrapper<Class>& x,int=0)const
+  Type& operator()(const reference_wrapper<Class>& x)const
   { 
     return operator()(x.get());
   }
@@ -105,7 +95,7 @@ struct non_const_member_base
     return operator()(*x);
   }
 
-  const Type& operator()(const Class& x,int=0)const
+  const Type& operator()(const Class& x)const
   {
     return x.*PtrToMember;
   }
@@ -115,7 +105,7 @@ struct non_const_member_base
     return x.*PtrToMember;
   }
 
-  const Type& operator()(const reference_wrapper<const Class>& x,int=0)const
+  const Type& operator()(const reference_wrapper<const Class>& x)const
   {
     return operator()(x.get());
   }
@@ -152,6 +142,9 @@ namespace detail{
  * Surprisingly enough, other compilers, like Intel C++ 7.0/7.1 and
  * Visual Age 6.0, have similar bugs. This replacement of member<>
  * can be used for them too.
+ *
+ * Support for such old compilers is dropped and
+ * [non_]const_member_offset_base is deprecated.
  */
 
 template<class Class,typename Type,std::size_t OffsetOfMember>
@@ -186,7 +179,7 @@ struct const_member_offset_base
     return operator()(x.get());
   }
 
-  Type& operator()(const reference_wrapper<Class>& x,int=0)const
+  Type& operator()(const reference_wrapper<Class>& x)const
   {
     return operator()(x.get());
   }
@@ -211,7 +204,7 @@ struct non_const_member_offset_base
     return operator()(*x);
   }
 
-  const Type& operator()(const Class& x,int=0)const
+  const Type& operator()(const Class& x)const
   {
     return *static_cast<const Type*>(
       static_cast<const void*>(
@@ -226,7 +219,7 @@ struct non_const_member_offset_base
         static_cast<char*>(static_cast<void *>(&x))+OffsetOfMember));
   }
 
-  const Type& operator()(const reference_wrapper<const Class>& x,int=0)const
+  const Type& operator()(const reference_wrapper<const Class>& x)const
   {
     return operator()(x.get());
   }