diff --git a/include/boost/aligned_storage.hpp b/include/boost/aligned_storage.hpp index 3bbe0eb..945fca9 100644 --- a/include/boost/aligned_storage.hpp +++ b/include/boost/aligned_storage.hpp @@ -20,7 +20,7 @@ #include "boost/type_traits/alignment_of.hpp" #include "boost/type_traits/type_with_alignment.hpp" -#include "boost/mpl/apply_if.hpp" +#include "boost/mpl/eval_if.hpp" #include "boost/mpl/identity.hpp" namespace boost { @@ -46,7 +46,7 @@ private: // representation { char buf[size_]; - typename mpl::apply_if_c< + typename mpl::eval_if_c< alignment_ == std::size_t(-1) , mpl::identity , type_with_alignment diff --git a/include/boost/type_traits/broken_compiler_spec.hpp b/include/boost/type_traits/broken_compiler_spec.hpp index a7137bc..16e324f 100644 --- a/include/boost/type_traits/broken_compiler_spec.hpp +++ b/include/boost/type_traits/broken_compiler_spec.hpp @@ -1,5 +1,5 @@ -// Copyright (c) 2001-2003 Aleksey Gurtovoy. +// Copyright 2001-2003 Aleksey Gurtovoy. // Use, modification and distribution are 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). diff --git a/include/boost/type_traits/conversion_traits.hpp b/include/boost/type_traits/conversion_traits.hpp index 452d120..8278531 100644 --- a/include/boost/type_traits/conversion_traits.hpp +++ b/include/boost/type_traits/conversion_traits.hpp @@ -1,7 +1,7 @@ -// Copyright (C) 2000 John Maddock (john@johnmaddock.co.uk) -// Copyright (C) 2000 Jeremy Siek (jsiek@lsc.nd.edu) -// Copyright (C) 1999, 2000 Jaakko J„rvi (jaakko.jarvi@cs.utu.fi) +// Copyright 2000 John Maddock (john@johnmaddock.co.uk) +// Copyright 2000 Jeremy Siek (jsiek@lsc.nd.edu) +// Copyright 1999, 2000 Jaakko J„rvi (jaakko.jarvi@cs.utu.fi) // // Use, modification and distribution are subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/boost/type_traits/detail/bool_trait_def.hpp b/include/boost/type_traits/detail/bool_trait_def.hpp index a05d6e9..fb2bb36 100644 --- a/include/boost/type_traits/detail/bool_trait_def.hpp +++ b/include/boost/type_traits/detail/bool_trait_def.hpp @@ -1,25 +1,24 @@ -//----------------------------------------------------------------------------- -// boost/type_traits/detail/bool_trait_def.hpp header file -// See http://www.boost.org for updates, documentation, and revision history. -//----------------------------------------------------------------------------- -// -// Copyright (c) 2002 -// Aleksey Gurtovoy -// -// Use, modification and distribution are 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). -// no include guards, the header is intended for multiple inclusion! +// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION -#include "boost/type_traits/detail/template_arity_spec.hpp" -#include "boost/mpl/bool.hpp" -#include "boost/mpl/aux_/lambda_support.hpp" -#include "boost/config.hpp" +// Copyright Aleksey Gurtovoy 2002-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) + +// $Source$ +// $Date$ +// $Revision$ + +#include +#include +#include +#include #if defined(__SUNPRO_CC) # define BOOST_TT_AUX_BOOL_TRAIT_VALUE_DECL(C) \ - typedef mpl::bool_< C > type; \ + typedef BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::bool_< C > type; \ enum { value = type::value }; \ /**/ # define BOOST_TT_AUX_BOOL_C_BASE(C) @@ -27,7 +26,7 @@ #elif defined(BOOST_MSVC) && BOOST_MSVC <= 1200 # define BOOST_TT_AUX_BOOL_TRAIT_VALUE_DECL(C) \ - typedef mpl::bool_< C > base_; \ + typedef BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::bool_< C > base_; \ using base_::value; \ /**/ @@ -38,7 +37,7 @@ #endif #ifndef BOOST_TT_AUX_BOOL_C_BASE -# define BOOST_TT_AUX_BOOL_C_BASE(C) : mpl::bool_< C > +# define BOOST_TT_AUX_BOOL_C_BASE(C) : BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::bool_< C > #endif @@ -167,7 +166,7 @@ namespace boost{ template struct integral_constant -: public mpl::integral_c {}; +: public BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::integral_c {}; template<> struct integral_constant< bool, true > \ @@ -184,8 +183,8 @@ template<> struct integral_constant< bool, false > \ }; namespace pending { -typedef mpl::true_ true_type; -typedef mpl::false_ false_type; +typedef BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::true_ true_type; +typedef BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::false_ false_type; } } diff --git a/include/boost/type_traits/detail/bool_trait_undef.hpp b/include/boost/type_traits/detail/bool_trait_undef.hpp index 12bff31..cbdd4aa 100644 --- a/include/boost/type_traits/detail/bool_trait_undef.hpp +++ b/include/boost/type_traits/detail/bool_trait_undef.hpp @@ -1,17 +1,15 @@ -//----------------------------------------------------------------------------- -// boost/type_traits/detail/bool_trait_undef.hpp header file -//----------------------------------------------------------------------------- -// -// Copyright (c) 2002 -// Aleksey Gurtovoy -// -// Use, modification and distribution are 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). -// -// See http://www.boost.org/libs/type_traits for most recent version including documentation. -// no include guards, the header is intended for multiple inclusion! +// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION + +// Copyright Aleksey Gurtovoy 2002-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) + +// $Source$ +// $Date$ +// $Revision$ #undef BOOST_TT_AUX_BOOL_TRAIT_VALUE_DECL #undef BOOST_TT_AUX_BOOL_C_BASE diff --git a/include/boost/type_traits/detail/is_function_ptr_helper.hpp b/include/boost/type_traits/detail/is_function_ptr_helper.hpp index 68322f6..20c7f80 100644 --- a/include/boost/type_traits/detail/is_function_ptr_helper.hpp +++ b/include/boost/type_traits/detail/is_function_ptr_helper.hpp @@ -1,6 +1,6 @@ -// Copyright (C) 2000 John Maddock (john@johnmaddock.co.uk) -// Copyright (C) 2002 Aleksey Gurtovoy (agurtovoy@meta-comm.com) +// Copyright 2000 John Maddock (john@johnmaddock.co.uk) +// Copyright 2002 Aleksey Gurtovoy (agurtovoy@meta-comm.com) // // Use, modification and distribution are subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp b/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp index 732f0aa..4d35dc3 100644 --- a/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp +++ b/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp @@ -343,7 +343,7 @@ template struct is_mem_fun_pointer_impl { BOOST_STATIC_CONSTANT(bool, value = true); }; // Metrowerks and Visual Age think this creates ambiguities -//: #if !((defined(__MWERKS__) && __MWERKS__ < 0x3000) || (defined(__IBMCPP__) && __IBMCPP__ <= 600)) +/// #if !((defined(__MWERKS__) && __MWERKS__ < 0x3000) || (defined(__IBMCPP__) && __IBMCPP__ <= 600)) template struct is_mem_fun_pointer_impl { BOOST_STATIC_CONSTANT(bool, value = true); }; @@ -352,7 +352,7 @@ struct is_mem_fun_pointer_impl { template struct is_mem_fun_pointer_impl { BOOST_STATIC_CONSTANT(bool, value = true); }; -//: #endif +/// #endif #undef i diff --git a/include/boost/type_traits/detail/size_t_trait_def.hpp b/include/boost/type_traits/detail/size_t_trait_def.hpp index beefa35..a680f99 100644 --- a/include/boost/type_traits/detail/size_t_trait_def.hpp +++ b/include/boost/type_traits/detail/size_t_trait_def.hpp @@ -1,20 +1,19 @@ -//----------------------------------------------------------------------------- -// boost/type_traits/detail/size_t_trait_def.hpp header file -// See http://www.boost.org for updates, documentation, and revision history. -//----------------------------------------------------------------------------- -// -// Copyright (c) 2002 -// Aleksey Gurtovoy -// -// Use, modification and distribution are 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). -// no include guards, the header is intended for multiple inclusion! +// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION -#include "boost/type_traits/detail/template_arity_spec.hpp" -#include "boost/mpl/size_t.hpp" -#include "boost/mpl/aux_/lambda_support.hpp" +// Copyright Aleksey Gurtovoy 2002-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) + +// $Source$ +// $Date$ +// $Revision$ + +#include +#include +#include #include diff --git a/include/boost/type_traits/detail/size_t_trait_undef.hpp b/include/boost/type_traits/detail/size_t_trait_undef.hpp index 9790eef..1694fac 100644 --- a/include/boost/type_traits/detail/size_t_trait_undef.hpp +++ b/include/boost/type_traits/detail/size_t_trait_undef.hpp @@ -1,16 +1,15 @@ -//----------------------------------------------------------------------------- -// boost/type_traits/detail/size_t_trait_undef.hpp header file -// See http://www.boost.org for updates, documentation, and revision history. -//----------------------------------------------------------------------------- -// -// Copyright (c) 2002 -// Aleksey Gurtovoy -// -// Use, modification and distribution are 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). -// no include guards, the header is intended for multiple inclusion! +// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION + +// Copyright Aleksey Gurtovoy 2002-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) + +// $Source$ +// $Date$ +// $Revision$ #undef BOOST_TT_AUX_SIZE_T_TRAIT_DEF1 #undef BOOST_TT_AUX_SIZE_T_TRAIT_SPEC1 diff --git a/include/boost/type_traits/detail/template_arity_spec.hpp b/include/boost/type_traits/detail/template_arity_spec.hpp index 06f3844..fe9b422 100644 --- a/include/boost/type_traits/detail/template_arity_spec.hpp +++ b/include/boost/type_traits/detail/template_arity_spec.hpp @@ -1,33 +1,28 @@ -//----------------------------------------------------------------------------- -// boost/type_traits/detail/template_arity_spec.hpp header file -// See http://www.boost.org for updates, documentation, and revision history. -//----------------------------------------------------------------------------- + +// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION + +// Copyright Aleksey Gurtovoy 2002-2004 // -// Copyright (c) 2002 -// Aleksey Gurtovoy -// -// Use, modification and distribution are 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). +// 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) -// no include guards, the header is intended for multiple inclusion! +#include +#include +#include +#include +#include -#include "boost/mpl/aux_/template_arity_fwd.hpp" -#include "boost/mpl/aux_/preprocessor/params.hpp" -#include "boost/mpl/aux_/lambda_support.hpp" -#include "boost/mpl/aux_/config/overload_resolution.hpp" -#include "boost/config.hpp" - -#if defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT) && \ - defined(BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION) +#if defined(BOOST_MPL_CFG_NO_FULL_LAMBDA_SUPPORT) \ + && defined(BOOST_MPL_CFG_BROKEN_OVERLOAD_RESOLUTION) # define BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(i, name) \ namespace mpl { namespace aux { \ template< BOOST_MPL_PP_PARAMS(i, typename T) > \ struct template_arity< \ - name< BOOST_MPL_PP_PARAMS(i, T) > \ - > \ + name< BOOST_MPL_PP_PARAMS(i, T) > \ + > \ + : int_ \ { \ - BOOST_STATIC_CONSTANT(int, value = i ); \ }; \ }} \ /**/ diff --git a/include/boost/type_traits/detail/type_trait_def.hpp b/include/boost/type_traits/detail/type_trait_def.hpp index 4094dd2..7438267 100644 --- a/include/boost/type_traits/detail/type_trait_def.hpp +++ b/include/boost/type_traits/detail/type_trait_def.hpp @@ -1,19 +1,18 @@ -//----------------------------------------------------------------------------- -// boost/type_traits/detail/type_trait_def.hpp header file -// See http://www.boost.org for updates, documentation, and revision history. -//----------------------------------------------------------------------------- -// -// Copyright (c) 2002 -// Aleksey Gurtovoy -// -// Use, modification and distribution are 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). -// no include guards, the header is intended for multiple inclusion! +// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION -#include "boost/type_traits/detail/template_arity_spec.hpp" -#include "boost/mpl/aux_/lambda_support.hpp" +// Copyright Aleksey Gurtovoy 2002-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) + +// $Source$ +// $Date$ +// $Revision$ + +#include +#include #define BOOST_TT_AUX_TYPE_TRAIT_DEF1(trait,T,result) \ template< typename T > struct trait \ diff --git a/include/boost/type_traits/detail/type_trait_undef.hpp b/include/boost/type_traits/detail/type_trait_undef.hpp index c65aa82..d8edf66 100644 --- a/include/boost/type_traits/detail/type_trait_undef.hpp +++ b/include/boost/type_traits/detail/type_trait_undef.hpp @@ -1,16 +1,15 @@ -//----------------------------------------------------------------------------- -// boost/type_traits/detail/type_trait_undef.hpp header file -// See http://www.boost.org for updates, documentation, and revision history. -//----------------------------------------------------------------------------- -// -// Copyright (c) 2002 -// Aleksey Gurtovoy -// -// Use, modification and distribution are 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). -// no include guards, the header is intended for multiple inclusion! +// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION + +// Copyright Aleksey Gurtovoy 2002-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) + +// $Source$ +// $Date$ +// $Revision$ #undef BOOST_TT_AUX_TYPE_TRAIT_DEF1 #undef BOOST_TT_AUX_TYPE_TRAIT_SPEC1 diff --git a/include/boost/type_traits/function_traits.hpp b/include/boost/type_traits/function_traits.hpp index c8ec4af..36efaec 100644 --- a/include/boost/type_traits/function_traits.hpp +++ b/include/boost/type_traits/function_traits.hpp @@ -1,5 +1,5 @@ -// Copyright (C) 2000 John Maddock (john@johnmaddock.co.uk) +// Copyright 2000 John Maddock (john@johnmaddock.co.uk) // Use, modification and distribution are 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). diff --git a/include/boost/type_traits/is_convertible.hpp b/include/boost/type_traits/is_convertible.hpp index 852a3a9..9d7cd95 100644 --- a/include/boost/type_traits/is_convertible.hpp +++ b/include/boost/type_traits/is_convertible.hpp @@ -1,7 +1,7 @@ -// Copyright (C) 2000 John Maddock (john@johnmaddock.co.uk) -// Copyright (C) 2000 Jeremy Siek (jsiek@lsc.nd.edu) -// Copyright (C) 1999, 2000 Jaakko J„rvi (jaakko.jarvi@cs.utu.fi) +// Copyright 2000 John Maddock (john@johnmaddock.co.uk) +// Copyright 2000 Jeremy Siek (jsiek@lsc.nd.edu) +// Copyright 1999, 2000 Jaakko J„rvi (jaakko.jarvi@cs.utu.fi) // // Use, modification and distribution are subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/boost/type_traits/is_function.hpp b/include/boost/type_traits/is_function.hpp index 0cf28b5..ef22d71 100644 --- a/include/boost/type_traits/is_function.hpp +++ b/include/boost/type_traits/is_function.hpp @@ -1,6 +1,6 @@ -// Copyright (C) 2000 John Maddock (john@johnmaddock.co.uk) -// Copyright (C) 2002 Aleksey Gurtovoy (agurtovoy@meta-comm.com) +// Copyright 2000 John Maddock (john@johnmaddock.co.uk) +// Copyright 2002 Aleksey Gurtovoy (agurtovoy@meta-comm.com) // // Use, modification and distribution are subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/boost/type_traits/transform_traits_spec.hpp b/include/boost/type_traits/transform_traits_spec.hpp index 8d046a3..4ab6e77 100644 --- a/include/boost/type_traits/transform_traits_spec.hpp +++ b/include/boost/type_traits/transform_traits_spec.hpp @@ -1,5 +1,5 @@ -// Copyright (c) 2001 Aleksey Gurtovoy. +// Copyright 2001 Aleksey Gurtovoy. // Use, modification and distribution are 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).