Release 1.39.0

[SVN r52732]

doc/lambda.xml

@@ -44,7 +44,7 @@
     <para>
 
       The Boost Lambda Library (BLL in the sequel) is a C++ template
-      library, which implements a form of <emphasis>lambda abstractions</emphasis> for C++.
+      library, which implements form of <emphasis>lambda abstractions</emphasis> for C++.
 The term originates from functional programming and lambda calculus, where a lambda abstraction defines an unnamed function.
       The primary motivation for the BLL is to provide flexible and
       convenient means to define unnamed function objects for STL algorithms.
@@ -3191,7 +3191,7 @@ to extend the library with new features.
 
 
 
-<section>
+<appendix>
 <title>Rationale for some of the design decisions</title>
 
 <section id="lambda.why_weak_arity">
@@ -3256,7 +3256,7 @@ was dropped.
 
 </section>
 
-</section>
+</appendix>
 
 
 

include/boost/lambda/detail/lambda_functors.hpp

@@ -13,30 +13,6 @@
 #ifndef BOOST_LAMBDA_LAMBDA_FUNCTORS_HPP
 #define BOOST_LAMBDA_LAMBDA_FUNCTORS_HPP
 
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
-
-#include <boost/mpl/or.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_array.hpp>
-
-#define BOOST_LAMBDA_DISABLE_IF_ARRAY1(A1, R1)\
-  typename lazy_disable_if<is_array<A1>, typename R1 >::type
-#define BOOST_LAMBDA_DISABLE_IF_ARRAY2(A1, A2, R1, R2) \
-  typename lazy_disable_if<mpl::or_<is_array<A1>, is_array<A2> >, typename R1, R2 >::type
-#define BOOST_LAMBDA_DISABLE_IF_ARRAY3(A1, A2, A3, R1, R2, R3) \
-  typename lazy_disable_if<mpl::or_<is_array<A1>, is_array<A2>, is_array<A3> >, typename R1, R2, R3 >::type
-
-#else
-
-#define BOOST_LAMBDA_DISABLE_IF_ARRAY1(A1, R1) typename R1::type
-#define BOOST_LAMBDA_DISABLE_IF_ARRAY2(A1, A2, R1, R2) typename R1, R2::type
-#define BOOST_LAMBDA_DISABLE_IF_ARRAY3(A1, A2, A3, R1, R2, R3) typename R1, R2, R3::type
-
-#endif
-
 namespace boost { 
 namespace lambda {
 
@@ -176,7 +152,7 @@ public:
   }
 
   template<class A>
-  BOOST_LAMBDA_DISABLE_IF_ARRAY1(A, inherited::template sig<tuple<A const&> >)
+  typename inherited::template sig<tuple<A const&> >::type
   operator()(A const& a) const { 
     return inherited::template call<
       typename inherited::template sig<tuple<A const&> >::type
@@ -192,7 +168,7 @@ public:
   }
 
   template<class A, class B>
-  BOOST_LAMBDA_DISABLE_IF_ARRAY2(A, B, inherited::template sig<tuple<A const&, B&> >)
+  typename inherited::template sig<tuple<A const&, B&> >::type
   operator()(A const& a, B& b) const { 
     return inherited::template call<
       typename inherited::template sig<tuple<A const&, B&> >::type
@@ -200,7 +176,7 @@ public:
   }
 
   template<class A, class B>
-  BOOST_LAMBDA_DISABLE_IF_ARRAY2(A, B, inherited::template sig<tuple<A&, B const&> >)
+  typename inherited::template sig<tuple<A&, B const&> >::type
   operator()(A& a, B const& b) const { 
     return inherited::template call<
       typename inherited::template sig<tuple<A&, B const&> >::type
@@ -208,7 +184,7 @@ public:
   }
 
   template<class A, class B>
-  BOOST_LAMBDA_DISABLE_IF_ARRAY2(A, B, inherited::template sig<tuple<A const&, B const&> >)
+  typename inherited::template sig<tuple<A const&, B const&> >::type
   operator()(A const& a, B const& b) const { 
     return inherited::template call<
       typename inherited::template sig<tuple<A const&, B const&> >::type
@@ -225,7 +201,7 @@ public:
   }
 
   template<class A, class B, class C>
-  BOOST_LAMBDA_DISABLE_IF_ARRAY3(A, B, C, inherited::template sig<tuple<A const&, B const&, C const&> >)
+  typename inherited::template sig<tuple<A const&, B const&, C const&> >::type
   operator()(A const& a, B const& b, C const& c) const
   { 
     return inherited::template call<

test/bind_tests_advanced.cpp

@@ -27,8 +27,7 @@
 #include <algorithm>
 
 
-using namespace boost::lambda;
-namespace bl = boost::lambda;
+using namespace boost::lambda; 
 
 int sum_0() { return 0; }
 int sum_1(int a) { return a; }
@@ -92,7 +91,7 @@ int call_with_100(const F& f) {
   // This would result in;
   // bind(_1 + 1, _1)(make_const(100)) , which would be a compile time error
 
-  return bl::bind(unlambda(f), _1)(make_const(100));
+  return bind(unlambda(f), _1)(make_const(100));
 
   // for other functors than lambda functors, unlambda has no effect
   // (except for making them const)
@@ -117,11 +116,11 @@ void test_unlambda() {
 
   BOOST_CHECK(call_with_101(_1 + 1) == 102);
 
-  BOOST_CHECK(call_with_100(bl::bind(std_functor(std::bind1st(std::plus<int>(), 1)), _1)) == 101);
+  BOOST_CHECK(call_with_100(bind(std_functor(std::bind1st(std::plus<int>(), 1)), _1)) == 101);
 
   // std_functor insturcts LL that the functor defines a result_type typedef
   // rather than a sig template.
-  bl::bind(std_functor(std::plus<int>()), _1, _2)(i, i);
+  bind(std_functor(std::plus<int>()), _1, _2)(i, i);
 }
 
 

test/bind_tests_simple.cpp

@@ -18,7 +18,9 @@
 
 #include <iostream>
 
-using namespace boost::lambda;
+
+  using namespace std;
+  using namespace boost::lambda;
 
 
 int sum_of_args_0() { return 0; }

test/bind_tests_simple_f_refs.cpp

@@ -18,7 +18,9 @@
 
 #include <iostream>
 
-using namespace boost::lambda;
+
+  using namespace std;
+  using namespace boost::lambda;
 
 
 int sum_of_args_0() { return 0; }

test/constructor_tests.cpp

@@ -29,7 +29,7 @@
 #endif
 
 using namespace boost::lambda;
-namespace bl = boost::lambda;
+using namespace std;
 
 template<class T>
 bool check_tuple(int n, const T& t) 
@@ -212,17 +212,17 @@ int count_deletes::count = 0;
 void test_news_and_deletes ()
 {
   int* i[10];
-  std::for_each(i, i+10, _1 = bind(new_ptr<int>(), 2));
+  for_each(i, i+10, _1 = bind(new_ptr<int>(), 2));
   int count_errors = 0;
 
-  std::for_each(i, i+10, (*_1 == 2) || ++var(count_errors));
+  for_each(i, i+10, (*_1 == 2) || ++var(count_errors));
   BOOST_CHECK(count_errors == 0);
 
 
   count_deletes* ct[10];
-  std::for_each(ct, ct+10, _1 = bind(new_ptr<count_deletes>()));
+  for_each(ct, ct+10, _1 = bind(new_ptr<count_deletes>()));
   count_deletes::count = 0;
-  std::for_each(ct, ct+10, bind(delete_ptr(), _1));
+  for_each(ct, ct+10, bind(delete_ptr(), _1));
   BOOST_CHECK(count_deletes::count == 10);
    
 }
@@ -240,16 +240,16 @@ void test_array_new_and_delete()
 
 void delayed_construction()
 {
-  std::vector<int> x(3);
-  std::vector<int> y(3);
+  vector<int> x(3);
+  vector<int> y(3);
 
-  std::fill(x.begin(), x.end(), 0);
-  std::fill(y.begin(), y.end(), 1);
+  fill(x.begin(), x.end(), 0);
+  fill(y.begin(), y.end(), 1);
   
-  std::vector<std::pair<int, int> > v;
+  vector<pair<int, int> > v;
 
-  std::transform(x.begin(), x.end(), y.begin(), std::back_inserter(v),
-            bl::bind(constructor<std::pair<int, int> >(), _1, _2) );
+  transform(x.begin(), x.end(), y.begin(), back_inserter(v),
+            bind(constructor<pair<int, int> >(), _1, _2) );
 }
 
 int test_main(int, char *[]) {