comparison DEPENDENCIES/generic/include/boost/multi_index/member.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

-/* 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)
  *
  * See http://www.boost.org/libs/multi_index for library home page.
  */
 
 #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
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
 #include <boost/mpl/if.hpp>

  *   *...n...*x is convertible to T&, for some n>=1.
  * Examples of chained pointers are raw and smart pointers, iterators and
  * 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
 {
   typedef Type result_type;
 

   Type& operator()(const reference_wrapper<const Class>& x)const
   {
     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());
   }
 };
 

   operator()(const ChainedPtr& x)const
   {
     return operator()(*x);
   }
 
-  const Type& operator()(const Class& x,int=0)const
+  const Type& operator()(const Class& x)const
   {
     return x.*PtrToMember;
   }
 
   Type& operator()(Class& x)const
   { 
     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());
   }
 
   Type& operator()(const reference_wrapper<Class>& x)const

  * so it serves as a workaround in this compiler for all practical
  * purposes.
  * 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>
 struct const_member_offset_base
 {

   Type& operator()(const reference_wrapper<const Class>& x)const
   {
     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());
   }
 };
 

   operator()(const ChainedPtr& x)const
   {
     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*>(
         static_cast<const char*>(
           static_cast<const void *>(&x))+OffsetOfMember));

     return *static_cast<Type*>(
       static_cast<void*>(
         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());
   }
 
   Type& operator()(const reference_wrapper<Class>& x)const