v2, v3, integration branch

[SVN r62649]

doc/Jamfile.v2

@@ -6,7 +6,6 @@ path-constant images : ../../spirit/phoenix/doc/html ;
 
 boostbook lambda-doc : lambda.xml 
 :
-   <xsl:param>boost.root=../../../..
    <format>pdf:<xsl:param>img.src.path=$(images)/
 ;
 

include/boost/lambda/detail/function_adaptors.hpp

@@ -16,9 +16,6 @@
 #include "boost/tuple/tuple.hpp"
 #include "boost/type_traits/same_traits.hpp"
 #include "boost/type_traits/remove_reference.hpp"
-#include "boost/type_traits/remove_cv.hpp"
-#include "boost/type_traits/add_const.hpp"
-#include "boost/type_traits/add_volatile.hpp"
 #include "boost/utility/result_of.hpp"
 
 namespace boost { 
@@ -26,7 +23,7 @@ namespace lambda {
 
 namespace detail {
 
-BOOST_MPL_HAS_XXX_TEMPLATE_DEF(sig)
+BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF(has_template_sig, sig, 1, true)
 
 template<class Tuple>
 struct remove_references_from_elements {
@@ -163,7 +160,7 @@ template <class Func> struct function_adaptor {
     : result_converter<
         Args
       , tuples::length<typename Args::tail_type>::value
-      , detail::has_sig<plainF>::value
+      , detail::has_template_sig<plainF, Args>::value
       >
   {};
 #else // BOOST_NO_RESULT_OF
@@ -240,26 +237,22 @@ struct function_adaptor<T Object::*> {
   // the data member is accessed is const, and finally adding a reference
   template<class Args> class sig { 
     typedef typename boost::tuples::element<1, Args>::type argument_type;
-    typedef typename boost::remove_reference<
-      argument_type
-    >::type unref_type;
 
-    typedef typename detail::IF<boost::is_const<unref_type>::value,
+    typedef typename detail::IF<boost::is_const<argument_type>::value,
       typename boost::add_const<T>::type,
       T
     >::RET properly_consted_return_type;
 
-    typedef typename detail::IF<boost::is_volatile<unref_type>::value,
+    typedef typename detail::IF<
+        boost::is_volatile<properly_consted_return_type>::value,
       typename boost::add_volatile<properly_consted_return_type>::type,
       properly_consted_return_type
     >::RET properly_cvd_return_type;
 
 
   public:
-    typedef typename detail::IF<boost::is_reference<argument_type>::value,
-      typename boost::add_reference<properly_cvd_return_type>::type,
-      typename boost::remove_cv<T>::type
-    >::RET type;
+    typedef typename 
+      boost::add_reference<properly_cvd_return_type>::type type;
   };
 
   template <class RET>

include/boost/lambda/detail/lambda_functors.hpp

@@ -15,7 +15,6 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
-#include <boost/utility/result_of.hpp>
 
 #if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
 
@@ -298,38 +297,6 @@ public:
 } // namespace lambda
 } // namespace boost
 
-namespace boost {
-
-#if !defined(BOOST_RESULT_OF_USE_DECLTYPE) || defined(BOOST_NO_DECLTYPE)
-
-template<class T>
-struct result_of<boost::lambda::lambda_functor<T>()>
-{
-    typedef typename boost::lambda::lambda_functor<T>::nullary_return_type type;
-};
-
-template<class T>
-struct result_of<const boost::lambda::lambda_functor<T>()>
-{
-    typedef typename boost::lambda::lambda_functor<T>::nullary_return_type type;
-};
-
-#endif
-
-template<class T>
-struct tr1_result_of<boost::lambda::lambda_functor<T>()>
-{
-    typedef typename boost::lambda::lambda_functor<T>::nullary_return_type type;
-};
-
-template<class T>
-struct tr1_result_of<const boost::lambda::lambda_functor<T>()>
-{
-    typedef typename boost::lambda::lambda_functor<T>::nullary_return_type type;
-};
-
-}
-
 // is_placeholder
 
 #include <boost/is_placeholder.hpp>

include/boost/lambda/detail/ret.hpp

@@ -284,7 +284,7 @@ inline const
 lambda_functor<
   lambda_functor_base<do_nothing_action, null_type> 
 > 
-make_void(const Arg1&) { 
+make_void(const Arg1& a1) { 
 return 
     lambda_functor_base<do_nothing_action, null_type>();
 }

include/boost/lambda/if.hpp

@@ -345,7 +345,7 @@ public:
 //      is true, the true_statement (again an lambda_functor) is executed
 //      otherwise, the false_statement (another lambda_functor) is executed. The
 //      result type of this is void. Note the trailing underscore after
-//      if_ and the leading dot and the trailing underscore before
+//      if_ and the the leading dot and the trailing underscore before
 //      and after .else_.
 //
 ///////////////////////////////////////////////////////////////////////////////

include/boost/lambda/loops.hpp

@@ -348,7 +348,7 @@ while_(CondT const& cond)
 //      While the condition (an lambda_functor) evaluates to true, statement
 //      (another lambda_functor) is executed. The statement is executed at least
 //      once. The result type of this is void. Note the trailing
-//      underscore after do_ and the leading dot and the trailing
+//      underscore after do_ and the the leading dot and the trailing
 //      underscore before and after .while_.
 //
 ///////////////////////////////////////////////////////////////////////////////

test/bind_tests_simple.cpp

@@ -80,23 +80,6 @@ void test_member_functions()
   // bind(&A::add, a, _1); 
 }
 
-struct B {
-  B(int n) : i(n) {};
-  int i;
-};
-
-void test_data_members()
-{
-  using boost::ref;
-  B b(10);
-  BOOST_CHECK(bind(&B::i, ref(b))() == 10);
-  BOOST_CHECK(bind(&B::i, b)() == 10);
-  BOOST_CHECK(bind(&B::i, _1)(b) == 10);
-  BOOST_CHECK(bind(&B::i, _1)(B(11)) == 11);
-  bind(&B::i, ref(b))() = 1;
-  BOOST_CHECK(b.i == 1);
-}
-
 int test_main(int, char *[]) {
 
   int i = 1; int j = 2; int k = 3;

test/result_of_tests.cpp

@@ -299,7 +299,7 @@ int test_main(int, char *[]) {
     BOOST_CHECK(boost::lambda::bind(with_result_template_reference(), var(one), var(two), var(three), var(four), var(five), var(six), var(seven), var(eight), var(nine))() == 9);
 
     // Check using result_of with lambda functors
-    BOOST_CHECK(apply0(constant(0)) == 0);
+    //BOOST_CHECK(apply0(constant(0)) == 0);
     BOOST_CHECK(apply1<int>(_1, one) == 1);
     BOOST_CHECK(apply1<int&>(_1, one) == 1);
     BOOST_CHECK(apply1<const int&>(_1, one) == 1);