* src/MenuBackend.[Ch]: the specialMenu is now a real menu, not a

[lyx.git] / boost / boost / iterator / indirect_iterator.hpp

diff --git a/boost/boost/iterator/indirect_iterator.hpp b/boost/boost/iterator/indirect_iterator.hpp
index 91c4283e3cb266e9bd2d367801d823676a475d4b..f181107121598fa65b574bfca6277f14e3bbab22 100644 (file)
--- a/boost/boost/iterator/indirect_iterator.hpp
+++ b/boost/boost/iterator/indirect_iterator.hpp
@@ -1,11 +1,9 @@
 // (C) Copyright David Abrahams 2002.
 // (C) Copyright Jeremy Siek    2002.
 // (C) Copyright Thomas Witt    2002.
-// Permission to copy, use, modify,
-// sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
+// 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)
 #ifndef BOOST_INDIRECT_ITERATOR_23022003THW_HPP
 #define BOOST_INDIRECT_ITERATOR_23022003THW_HPP
 
@@ -16,18 +14,18 @@
 #include <boost/indirect_reference.hpp>
 #include <boost/detail/iterator.hpp>
 
-#include <boost/python/detail/indirect_traits.hpp>
+#include <boost/detail/indirect_traits.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/mpl/apply_if.hpp>
+#include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/not.hpp>
-#include <boost/mpl/aux_/has_xxx.hpp>
+#include <boost/mpl/has_xxx.hpp>
 
-#ifdef BOOST_MPL_NO_AUX_HAS_XXX
+#ifdef BOOST_MPL_CFG_NO_HAS_XXX
 # include <boost/shared_ptr.hpp>
 # include <boost/scoped_ptr.hpp>
 # include <boost/mpl/bool.hpp>
@@ -57,7 +55,7 @@ namespace boost
           , Category
           , typename ia_dflt_help<
                 Reference
-              , mpl::apply_if<
+              , mpl::eval_if<
                     is_same<Value,use_default>
                   , indirect_reference<dereferenceable>
                   , add_reference<Value>