X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Ffunction_equal.hpp;h=2d76c75bc90c50c4d91b839ca53350491eb26010;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=8bd06a3bb79d0afc98c775b04ad50a6cdad1913a;hpb=2349a51b124cafaf65ca673f8e7fd931f4ba4961;p=lyx.git

diff --git a/boost/boost/function_equal.hpp b/boost/boost/function_equal.hpp
index 8bd06a3bb7..2d76c75bc9 100644
--- a/boost/boost/function_equal.hpp
+++ b/boost/boost/function_equal.hpp
@@ -1,6 +1,9 @@
-//  Copyright Douglas Gregor 2004. Use, modification and
-//  distribution is subject to the Boost Software License, Version
-//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  Copyright Douglas Gregor 2004.
+//  Copyright 2005 Peter Dimov
+
+//  Use, modification and distribution is subject to
+//  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)
 
 // For more information, see http://www.boost.org
@@ -9,15 +12,16 @@
 
 namespace boost {
 
-namespace detail {
-  template<typename F, typename G>
-    bool function_equal_impl(const F& f, const G& g, long)
-    { return f == g; }
-} // end namespace boost::function
+template<typename F, typename G>
+  bool function_equal_impl(const F& f, const G& g, long)
+  { return f == g; }
+
+// function_equal_impl needs to be unqualified to pick
+// user overloads on two-phase compilers
 
 template<typename F, typename G>
   bool function_equal(const F& f, const G& g)
-  { return ::boost::detail::function_equal_impl(f, g, 0); }
+  { return function_equal_impl(f, g, 0); }
 
 } // end namespace boost