Merge with the offending files removed.

[SVN r39995]

doc/index.rst

@@ -82,7 +82,7 @@ __ ../../../../index.htm
 
 .. _`Boost Consulting`: http://www.boost-consulting.com
 
-.. _concepts: http://www.boost.org/more/generic_programming.html#concept
+.. _concepts: ../../../more/generic_programming.html#concept
 
 -------------------------------------
 

doc/reference.rst

@@ -174,7 +174,7 @@ Concepts
 
 This section describes the generic type concepts_ used by the Parameter library. 
 
-.. _concepts: http://www.boost.org/more/generic_programming.html#concept
+.. _concepts: ../../../../more/generic_programming.html#concept
 
 |ArgumentPack|
 --------------

include/boost/parameter.hpp

@@ -3,8 +3,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at 
 // http://www.boost.org/LICENSE_1_0.txt)
 
-//  See www.boost.org/libs/parameter for documentation.
-
 #ifndef BOOST_PARAMETER_050401_HPP
 #define BOOST_PARAMETER_050401_HPP
 

include/boost/parameter/aux_/arg_list.hpp

@@ -24,7 +24,6 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/facilities/intercept.hpp>
 
 namespace boost { namespace parameter { 

include/boost/parameter/aux_/cast.hpp

@@ -5,8 +5,6 @@
 #ifndef BOOST_PARAMETER_CAST_060902_HPP
 # define BOOST_PARAMETER_CAST_060902_HPP
 
-# include <boost/detail/workaround.hpp>
-
 # if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
   && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  include <boost/type_traits/add_reference.hpp>

include/boost/parameter/aux_/default.hpp

@@ -4,9 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef DEFAULT_050329_HPP
-# define DEFAULT_050329_HPP
-
-# include <boost/detail/workaround.hpp>
+#define DEFAULT_050329_HPP
 
 namespace boost { namespace parameter { namespace aux {
 
@@ -29,7 +27,7 @@ struct default_
 //    the user when resolving the value of the parameter with the
 //    given keyword
 //
-# if BOOST_WORKAROUND(__EDG_VERSION__, <= 300)
+#if BOOST_WORKAROUND(__EDG_VERSION__, <= 300)
 // These compilers need a little extra help with overload
 // resolution; we have empty_arg_list's operator[] accept a base
 // class to make that overload less preferable.
@@ -50,8 +48,8 @@ struct lazy_default
         : lazy_default_base<KW,DefaultComputer>(x)
       {}
   };
-#  define BOOST_PARAMETER_lazy_default_fallback lazy_default_base
-# else 
+# define BOOST_PARAMETER_lazy_default_fallback lazy_default_base
+#else 
 template <class KW, class DefaultComputer>
 struct lazy_default
 {
@@ -60,8 +58,8 @@ struct lazy_default
     {}
     DefaultComputer const& compute_default;
 };
-#  define BOOST_PARAMETER_lazy_default_fallback lazy_default
-# endif 
+# define BOOST_PARAMETER_lazy_default_fallback lazy_default
+#endif 
 
 }}} // namespace boost::parameter::aux
 

include/boost/parameter/aux_/python/invoker.hpp

@@ -8,7 +8,6 @@
 # include <boost/mpl/begin.hpp>
 # include <boost/mpl/next.hpp>
 # include <boost/mpl/deref.hpp>
-# include <boost/mpl/size.hpp>
 # include <boost/parameter/keyword.hpp>
 # include <boost/preprocessor/iteration/iterate.hpp>
 

include/boost/parameter/aux_/set.hpp

@@ -5,8 +5,6 @@
 #ifndef BOOST_PARAMETER_SET_060912_HPP
 # define BOOST_PARAMETER_SET_060912_HPP
 
-# include <boost/detail/workaround.hpp>
-
 # if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
   && !BOOST_WORKAROUND(__GNUC__, < 3)
 #  include <boost/mpl/insert.hpp>

include/boost/parameter/aux_/tagged_argument.hpp

@@ -14,7 +14,6 @@
 # include <boost/mpl/and.hpp>
 # include <boost/mpl/not.hpp>
 # include <boost/type_traits/is_same.hpp>
-# include <boost/type_traits/is_convertible.hpp>
 # include <boost/type_traits/is_reference.hpp>
 
 namespace boost { namespace parameter { namespace aux {

include/boost/parameter/macros.hpp

@@ -15,7 +15,6 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/cat.hpp>
-#include <boost/detail/workaround.hpp>
 
 #define BOOST_PARAMETER_FUN_TEMPLATE_HEAD1(n) \
     template<BOOST_PP_ENUM_PARAMS(n, class T)>

include/boost/parameter/preprocessor.hpp

@@ -14,7 +14,6 @@
 # include <boost/parameter/aux_/preprocessor/flatten.hpp>
 
 # include <boost/preprocessor/repetition/repeat_from_to.hpp>
-# include <boost/preprocessor/comparison/equal.hpp>
 # include <boost/preprocessor/control/if.hpp>
 # include <boost/preprocessor/control/expr_if.hpp>
 # include <boost/preprocessor/repetition/enum_params.hpp>
@@ -24,11 +23,9 @@
 # include <boost/preprocessor/seq/for_each_product.hpp>
 # include <boost/preprocessor/seq/for_each_i.hpp> 
 # include <boost/preprocessor/tuple/elem.hpp> 
-# include <boost/preprocessor/tuple/eat.hpp>
 # include <boost/preprocessor/seq/fold_left.hpp>
 # include <boost/preprocessor/seq/size.hpp>
 # include <boost/preprocessor/seq/enum.hpp>
-# include <boost/preprocessor/seq/push_back.hpp>
 
 # include <boost/preprocessor/detail/is_nullary.hpp>
 
@@ -152,8 +149,7 @@ struct argument_pack
       , typename Parameters::deduced_list
       , tag_keyword_arg
       , mpl::false_
-    >::type result;
-    typedef typename mpl::first<result>::type type;
+    >::type type;
 };
 
 # if 1 //BOOST_WORKAROUND(BOOST_MSVC, < 1300)