7 files changed, 25 insertions, 9 deletions
diff --git a/boost/multi_index/detail/ord_index_impl.hpp b/boost/multi_index/detail/ord_index_impl.hpp
index 8ebaccb2cf..040cb98963 100644
--- a/boost/multi_index/detail/ord_index_impl.hpp
+++ b/boost/multi_index/detail/ord_index_impl.hpp
@@ -1556,7 +1556,7 @@ template<
 inline boost::mpl::true_* boost_foreach_is_noncopyable(
   boost::multi_index::detail::ordered_index<
     KeyFromValue,Compare,SuperMeta,TagList,Category,AugmentPolicy>*&,
-  boost::foreach::tag)
+  boost_foreach_argument_dependent_lookup_hack)
 {
   return 0;
 }
diff --git a/boost/multi_index/global_fun.hpp b/boost/multi_index/global_fun.hpp
index 3ae2afdafc..2c13769100 100644
--- a/boost/multi_index/global_fun.hpp
+++ b/boost/multi_index/global_fun.hpp
@@ -14,6 +14,7 @@
 #endif
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
+#include <boost/detail/workaround.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/is_reference.hpp>
@@ -80,7 +81,14 @@ struct const_ref_global_fun_base
   Type operator()(
     const reference_wrapper<
       typename remove_const<
-        typename remove_reference<Value>::type>::type>& x)const
+        typename remove_reference<Value>::type>::type>& x
+
+#if BOOST_WORKAROUND(BOOST_MSVC,==1310)
+/* http://lists.boost.org/Archives/boost/2015/10/226135.php */
+    ,int=0
+#endif
+
+  )const
   { 
     return operator()(x.get());
   }
diff --git a/boost/multi_index/hashed_index.hpp b/boost/multi_index/hashed_index.hpp
index 436fecf771..352d0c13f1 100644
--- a/boost/multi_index/hashed_index.hpp
+++ b/boost/multi_index/hashed_index.hpp
@@ -1714,7 +1714,7 @@ template<
 inline boost::mpl::true_* boost_foreach_is_noncopyable(
   boost::multi_index::detail::hashed_index<
     KeyFromValue,Hash,Pred,SuperMeta,TagList,Category>*&,
-  boost::foreach::tag)
+  boost_foreach_argument_dependent_lookup_hack)
 {
   return 0;
 }
diff --git a/boost/multi_index/identity.hpp b/boost/multi_index/identity.hpp
index 370deb928b..6c832ce156 100644
--- a/boost/multi_index/identity.hpp
+++ b/boost/multi_index/identity.hpp
@@ -14,6 +14,7 @@
 #endif
 
 #include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/multi_index/identity_fwd.hpp>
 #include <boost/type_traits/is_const.hpp>
@@ -71,7 +72,14 @@ struct const_identity_base
   }
 
   Type& operator()(
-    const reference_wrapper<typename remove_const<Type>::type>& x)const
+    const reference_wrapper<typename remove_const<Type>::type>& x
+
+#if BOOST_WORKAROUND(BOOST_MSVC,==1310)
+/* http://lists.boost.org/Archives/boost/2015/10/226135.php */
+    ,int=0
+#endif
+
+  )const
   { 
     return x.get();
   }
diff --git a/boost/multi_index/random_access_index.hpp b/boost/multi_index/random_access_index.hpp
index 5a628fb75a..fe1884ddd3 100644
--- a/boost/multi_index/random_access_index.hpp
+++ b/boost/multi_index/random_access_index.hpp
@@ -1156,7 +1156,7 @@ struct random_access
 template<typename SuperMeta,typename TagList>
 inline boost::mpl::true_* boost_foreach_is_noncopyable(
   boost::multi_index::detail::random_access_index<SuperMeta,TagList>*&,
-  boost::foreach::tag)
+  boost_foreach_argument_dependent_lookup_hack)
 {
   return 0;
 }
diff --git a/boost/multi_index/ranked_index.hpp b/boost/multi_index/ranked_index.hpp
index a5da5242ca..4fd4d32c75 100644
--- a/boost/multi_index/ranked_index.hpp
+++ b/boost/multi_index/ranked_index.hpp
@@ -270,7 +270,7 @@ struct rank_policy
     typedef ranked_index<OrderedIndexImpl> type;
   };
 
-  /* algorihmic stuff */
+  /* algorithmic stuff */
 
   template<typename Pointer>
   static void add(Pointer x,Pointer root)
@@ -302,13 +302,13 @@ struct rank_policy
   {
     y->size=x->size;
     x->size=ranked_node_size(x->left())+ranked_node_size(x->right())+1;
-  };
+  }
 
   template<typename Pointer>
   static void rotate_right(Pointer x,Pointer y) /* in: x==y->right() */
   {
     rotate_left(x,y);
-  };
+  }
 
 #if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING)
   /* invariant stuff */
diff --git a/boost/multi_index/sequenced_index.hpp b/boost/multi_index/sequenced_index.hpp
index ce96bb5f9a..424eebc376 100644
--- a/boost/multi_index/sequenced_index.hpp
+++ b/boost/multi_index/sequenced_index.hpp
@@ -1051,7 +1051,7 @@ struct sequenced
 template<typename SuperMeta,typename TagList>
 inline boost::mpl::true_* boost_foreach_is_noncopyable(
   boost::multi_index::detail::sequenced_index<SuperMeta,TagList>*&,
-  boost::foreach::tag)
+  boost_foreach_argument_dependent_lookup_hack)
 {
   return 0;
 }