X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Fmpl%2Falways.hpp;h=f98423138c08b80003b0330a5aafa8d89638f2a5;hb=c48091f33a773732fa6c789927e5833e44108d9d;hp=998b62582968e740f626241d9c32ca195247a4ee;hpb=786216c0899498434cab9f33780f9c178a0a4006;p=lyx.git

diff --git a/boost/boost/mpl/always.hpp b/boost/boost/mpl/always.hpp
index 998b625829..f98423138c 100644
--- a/boost/boost/mpl/always.hpp
+++ b/boost/boost/mpl/always.hpp
@@ -1,36 +1,30 @@
-//-----------------------------------------------------------------------------
-// boost mpl/always.hpp header file
-// See http://www.boost.org for updates, documentation, and revision history.
-//-----------------------------------------------------------------------------
-//
-// Copyright (c) 2001-02
-// Aleksey Gurtovoy
-//
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee, 
-// provided that the above copyright notice appears in all copies and 
-// that both the copyright notice and this permission notice appear in 
-// supporting documentation. No representations are made about the 
-// suitability of this software for any purpose. It is provided "as is" 
-// without express or implied warranty.
 
 #ifndef BOOST_MPL_ALWAYS_HPP_INCLUDED
 #define BOOST_MPL_ALWAYS_HPP_INCLUDED
 
-#include "boost/mpl/aux_/preprocessor/def_params_tail.hpp"
-#include "boost/mpl/void.hpp"
-#include "boost/mpl/aux_/arity_spec.hpp"
-#include "boost/mpl/aux_/lambda_spec.hpp"
+// Copyright Aleksey Gurtovoy 2001-2004
+//
+// 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/mpl for documentation.
 
-namespace boost {
-namespace mpl {
+// $Id: always.hpp 49267 2008-10-11 06:19:02Z agurtovoy $
+// $Date: 2008-10-11 02:19:02 -0400 (Sat, 11 Oct 2008) $
+// $Revision: 49267 $
 
-template< typename Value >
-struct always
+#include <boost/mpl/aux_/preprocessor/def_params_tail.hpp>
+#include <boost/mpl/aux_/na.hpp>
+#include <boost/mpl/aux_/arity_spec.hpp>
+
+namespace boost { namespace mpl {
+
+template< typename Value > struct always
 {
     template<
           typename T
-        BOOST_MPL_PP_NESTED_DEF_PARAMS_TAIL(1, typename T, void_)
+        BOOST_MPL_PP_NESTED_DEF_PARAMS_TAIL(1, typename T, na)
         >
     struct apply
     {
@@ -38,11 +32,8 @@ struct always
     };
 };
 
+BOOST_MPL_AUX_ARITY_SPEC(1, always)
 
-BOOST_MPL_AUX_ARITY_SPEC(1,always)
-BOOST_MPL_AUX_PASS_THROUGH_LAMBDA_SPEC(1,always)
-
-} // namespace mpl
-} // namespace boost
+}}
 
 #endif // BOOST_MPL_ALWAYS_HPP_INCLUDED