Subject: [Boost-commit] svn:boost r60840 - in sandbox/statistics/detail/assign: boost/assign boost/assign/auto_size/check boost/assign/auto_size/range libs/assign/doc libs/assign/example
From: erwann.rogard_at_[hidden]
Date: 2010-03-25 22:14:15
Author: e_r
Date: 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
New Revision: 60840
URL: http://svn.boost.org/trac/boost/changeset/60840
Log:
m
Text files modified:
sandbox/statistics/detail/assign/boost/assign/auto_size/check/all.hpp | 12 +++++-----
sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_convert_l.hpp | 6 ++--
sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_convert_r.hpp | 20 +++++++++---------
sandbox/statistics/detail/assign/boost/assign/auto_size/check/example2.hpp | 8 +++---
sandbox/statistics/detail/assign/boost/assign/auto_size/check/unit_testing.hpp | 4 +-
sandbox/statistics/detail/assign/boost/assign/auto_size/range/chain.hpp | 42 ++++++++++++++++++++--------------------
sandbox/statistics/detail/assign/boost/assign/chain_convert.hpp | 2
sandbox/statistics/detail/assign/libs/assign/doc/compilers_tested.txt | 4 +-
sandbox/statistics/detail/assign/libs/assign/doc/patch.txt | 2
sandbox/statistics/detail/assign/libs/assign/doc/revision_history.txt | 4 +-
sandbox/statistics/detail/assign/libs/assign/example/range.cpp | 2
11 files changed, 53 insertions(+), 53 deletions(-)
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/check/all.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/check/all.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/check/all.hpp 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -27,8 +27,8 @@
#include <boost/assign/auto_size/check/converter.hpp>
#include <boost/assign/auto_size/check/fifo.hpp>
#include <boost/assign/auto_size/check/lifo.hpp>
-#include <boost/assign/auto_size/check/chain_convert_r.hpp>
-#include <boost/assign/auto_size/check/chain_convert_l.hpp>
+#include <boost/assign/auto_size/check/chain_r.hpp>
+#include <boost/assign/auto_size/check/chain_l.hpp>
#include <boost/assign/auto_size/check/example2.hpp>
#define BOOST_ASSIGN_AS_CHECK_fun_tpl(suffix) \
@@ -66,10 +66,10 @@
BOOST_ASSIGN_AS_CHECK_adapter_lifo(std::stack<T>) \
BOOST_ASSIGN_AS_CHECK_fun_tpl(adapter_queue)() \
BOOST_ASSIGN_AS_CHECK_adapter_fifo(std::queue<T>) \
- BOOST_ASSIGN_AS_CHECK_fun_tpl(chain_convert_r)() \
- BOOST_ASSIGN_AS_CHECK_chain_convert_r \
- BOOST_ASSIGN_AS_CHECK_fun_tpl(chain_convert_l)() \
- BOOST_ASSIGN_AS_CHECK_chain_convert_l \
+ BOOST_ASSIGN_AS_CHECK_fun_tpl(chain_r)() \
+ BOOST_ASSIGN_AS_CHECK_chain_r \
+ BOOST_ASSIGN_AS_CHECK_fun_tpl(chain_l)() \
+ BOOST_ASSIGN_AS_CHECK_chain_l \
BOOST_ASSIGN_AS_CHECK_fun_tpl(example2)() \
BOOST_ASSIGN_AS_CHECK_example2 \
} \
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_convert_l.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_convert_l.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_convert_l.hpp 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// assign::detail::auto_size::check_chain_convert_l.hpp //
+// assign::detail::auto_size::check_chain_l.hpp //
// //
// (C) Copyright 2010 Erwann Rogard //
// Use, modification and distribution are subject to the //
@@ -11,7 +11,7 @@
#include <boost/array.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/range/algorithm/copy.hpp>
-#include <boost/assign/auto_size/range/chain_convert.hpp>
+#include <boost/assign/auto_size/range/chain.hpp>
#include <boost/assign/auto_size/check/iterator.hpp>
#include <boost/assign/auto_size/check/constants.hpp>
#include <boost/assign/auto_size/check/copy_iterator.hpp>
@@ -20,7 +20,7 @@
#error
#endif
-#define BOOST_ASSIGN_AS_CHECK_chain_convert_l \
+#define BOOST_ASSIGN_AS_CHECK_chain_l \
{ \
typedef T val_; \
using namespace check_constants; \
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_convert_r.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_convert_r.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/check/chain_convert_r.hpp 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -11,7 +11,7 @@
#include <boost/array.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/range/algorithm/copy.hpp>
-#include <boost/assign/auto_size/range/chain_convert.hpp>
+#include <boost/assign/auto_size/range/chain.hpp>
#include <boost/assign/auto_size/check/iterator.hpp>
#include <boost/assign/auto_size/check/constants.hpp>
#include <boost/assign/auto_size/check/copy_iterator.hpp>
@@ -20,7 +20,7 @@
#error
#endif
-#define BOOST_ASSIGN_AS_CHECK_chain_convert_r \
+#define BOOST_ASSIGN_AS_CHECK_chain_r \
{ \
typedef T val_; \
using namespace check_constants; \
@@ -37,14 +37,14 @@
BOOST_AUTO(tmp1,BOOST_ASSIGN_AS_CHECK_ref3(a1,b1,c1)); \
BOOST_AUTO(tmp2,BOOST_ASSIGN_AS_CHECK_ref3(d1,e1,f1)); \
BOOST_AUTO(tmp3,BOOST_ASSIGN_AS_CHECK_ref2(g1,h1)); \
- check_iterator_impl( boost::begin( chain_convert_r(ar1)(ar2)(ar3) ) ); \
- check_iterator_impl( boost::begin( chain_convert_r(ar1)(ar2)(tmp3) ) ); \
- check_iterator_impl( boost::begin( chain_convert_r(ar1)(tmp2)(ar3) ) ); \
- check_iterator_impl( boost::begin( chain_convert_r(ar1)(tmp2)(tmp3) ) ); \
- check_iterator_impl( boost::begin( chain_convert_r(tmp1)(ar2)(ar3) ) ); \
- check_iterator_impl( boost::begin( chain_convert_r(tmp1)(ar2)(tmp3) ) ); \
- check_iterator_impl( boost::begin( chain_convert_r(tmp1)(tmp2)(ar3) ) ); \
- check_iterator_impl( boost::begin( chain_convert_r(tmp1)(tmp2)(tmp3) ) ); \
+ check_iterator_impl( boost::begin( chain_r(ar1)(ar2)(ar3) ) ); \
+ check_iterator_impl( boost::begin( chain_r(ar1)(ar2)(tmp3) ) ); \
+ check_iterator_impl( boost::begin( chain_r(ar1)(tmp2)(ar3) ) ); \
+ check_iterator_impl( boost::begin( chain_r(ar1)(tmp2)(tmp3) ) ); \
+ check_iterator_impl( boost::begin( chain_r(tmp1)(ar2)(ar3) ) ); \
+ check_iterator_impl( boost::begin( chain_r(tmp1)(ar2)(tmp3) ) ); \
+ check_iterator_impl( boost::begin( chain_r(tmp1)(tmp2)(ar3) ) ); \
+ check_iterator_impl( boost::begin( chain_r(tmp1)(tmp2)(tmp3) ) ); \
} \
/**/
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/check/example2.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/check/example2.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/check/example2.hpp 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -11,7 +11,7 @@
#include <vector>
#include <iterator>
#include <boost/range/algorithm/copy.hpp>
-#include <boost/assign/auto_size/range/chain_convert.hpp>
+#include <boost/assign/auto_size/range/chain.hpp>
#define BOOST_ASSIGN_AS_CHECK_example2 \
{ \
@@ -19,14 +19,14 @@
std::vector<int> v, v2; \
v = BOOST_ASSIGN_AS_CHECK_cref3(1,2,3); \
boost::copy( \
- chain_convert_r( \
+ chain_r( \
BOOST_ASSIGN_AS_CHECK_cref1(0) \
)( v )( v )( BOOST_ASSIGN_AS_CHECK_cref1(4) ), \
std::back_inserter(v2) \
); \
BOOST_ASSIGN_CHECK_EQUAL( v2.size() , 8u ); \
boost::copy( \
- chain_convert_r(v2)(BOOST_ASSIGN_AS_CHECK_cref1(5)), \
+ chain_r(v2)(BOOST_ASSIGN_AS_CHECK_cref1(5)), \
std::back_inserter(v) \
); \
BOOST_ASSIGN_CHECK_EQUAL( v.size() , 12u ); \
@@ -34,7 +34,7 @@
int y = 1; \
BOOST_ASSIGN_CHECK_EQUAL( \
boost::size( \
- chain_convert_r( \
+ chain_r( \
BOOST_ASSIGN_AS_CHECK_cref1( x ) \
)( v2 )( BOOST_ASSIGN_AS_CHECK_cref1( y ) ) \
), \
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/check/unit_testing.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/check/unit_testing.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/check/unit_testing.hpp 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -36,8 +36,8 @@
BOOST_ASSIGN_AS_CHECK_add(converter_set) \
BOOST_ASSIGN_AS_CHECK_add(adapter_stack) \
BOOST_ASSIGN_AS_CHECK_add(adapter_queue) \
- BOOST_ASSIGN_AS_CHECK_add(chain_convert_r) \
- BOOST_ASSIGN_AS_CHECK_add(chain_convert_l) \
+ BOOST_ASSIGN_AS_CHECK_add(chain_r) \
+ BOOST_ASSIGN_AS_CHECK_add(chain_l) \
BOOST_ASSIGN_AS_CHECK_add(example2) \
\
return test; \
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/range/chain.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/range/chain.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/range/chain.hpp 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -35,7 +35,7 @@
namespace boost{
namespace assign{
namespace detail{
-namespace chain_convert_impl{
+namespace chain_impl{
// ---- template parameters ---- //
@@ -172,14 +172,14 @@
template<typename Rng1,typename V,typename R, bool add_const>
struct first_expr{
- typedef chain_convert_impl::expr<top_,top_,Rng1,1,V,R,add_const> type;
+ typedef chain_impl::expr<top_,top_,Rng1,1,V,R,add_const> type;
typedef typename basic_chain_impl::sel_const<Rng1,add_const>::type cr1_;
static type call(cr1_& r1){ return type(r1); }
};
template<typename Rng1,typename V,
typename R = typename detail::convert_range_reference<Rng1,V>::type>
- struct first_expr_l : chain_convert_impl::first_expr<Rng1,V,R,false>{};
+ struct first_expr_l : chain_impl::first_expr<Rng1,V,R,false>{};
// It's necessary to take add_const<V> or else non-rvalues may occur e.g.
// Rng1 = array<ref_wrapper<int>,1> and V = int, then R = int*.
@@ -187,7 +187,7 @@
typename R = typename detail::convert_range_reference<const Rng1,
typename boost::add_const<V>::type>::type>
struct first_expr_r
- : chain_convert_impl::first_expr<
+ : chain_impl::first_expr<
Rng1,typename boost::add_const<V>::type,R,true>{};
template<typename Rng1,bool add_const>
@@ -198,75 +198,75 @@
typedef typename basic_chain_impl::sel_const<to_,add_const>::type type;
};
-}// chain_convert_l_impl
+}// chain_l_impl
}// detail
// lvalue
template<typename V,typename R,typename Rng1>
- typename detail::chain_convert_impl::first_expr_l<Rng1,V,R>::type
+ typename detail::chain_impl::first_expr_l<Rng1,V,R>::type
chain_l(Rng1& r1,
typename boost::disable_if<boost::is_same<R,use_default> >::type* = 0
){
- typedef detail::chain_convert_impl::first_expr_l<Rng1,V,R> caller_;
+ typedef detail::chain_impl::first_expr_l<Rng1,V,R> caller_;
return caller_::call(r1);
}
template<typename V,typename R,typename Rng1>
- typename detail::chain_convert_impl::first_expr_l<Rng1,V>::type
+ typename detail::chain_impl::first_expr_l<Rng1,V>::type
chain_l(Rng1& r1,
typename boost::enable_if<boost::is_same<R,use_default> >::type* = 0
){
- typedef detail::chain_convert_impl::first_expr_l<Rng1,V> caller_;
+ typedef detail::chain_impl::first_expr_l<Rng1,V> caller_;
return caller_::call(r1);
}
template<typename Rng1>
- typename detail::chain_convert_impl::first_expr_l<
+ typename detail::chain_impl::first_expr_l<
Rng1,
- typename detail::chain_convert_impl::deduce_value<Rng1,false>::type
+ typename detail::chain_impl::deduce_value<Rng1,false>::type
>::type
chain_l(Rng1& r1)
{
- typedef typename detail::chain_convert_impl::deduce_value<
+ typedef typename detail::chain_impl::deduce_value<
Rng1,false
>::type val_;
- typedef detail::chain_convert_impl::first_expr_l<Rng1,val_> caller_;
+ typedef detail::chain_impl::first_expr_l<Rng1,val_> caller_;
return caller_::call(r1);
}
// rvalue : Warning: if is_const<V> != true, R must be value, not a ref.
template<typename V,typename R,typename Rng1>
- typename detail::chain_convert_impl::first_expr_r<Rng1,V,R>::type
+ typename detail::chain_impl::first_expr_r<Rng1,V,R>::type
chain_r(const Rng1& r1,
typename boost::disable_if<boost::is_same<R,use_default> >::type* = 0
){
- typedef detail::chain_convert_impl::first_expr_r<Rng1,V,R> caller_;
+ typedef detail::chain_impl::first_expr_r<Rng1,V,R> caller_;
return caller_::call(r1);
}
template<typename V,typename R,typename Rng1>
- typename detail::chain_convert_impl::first_expr_r<Rng1,V>::type
+ typename detail::chain_impl::first_expr_r<Rng1,V>::type
chain_r(const Rng1& r1,
typename boost::enable_if<boost::is_same<R,use_default> >::type* = 0
){
- typedef detail::chain_convert_impl::first_expr_r<Rng1,V> caller_;
+ typedef detail::chain_impl::first_expr_r<Rng1,V> caller_;
return caller_::call(r1);
}
template<typename Rng1>
- typename detail::chain_convert_impl::first_expr_r<
+ typename detail::chain_impl::first_expr_r<
Rng1,
- typename detail::chain_convert_impl::deduce_value<
+ typename detail::chain_impl::deduce_value<
const Rng1,true>::type
>::type
chain_r(const Rng1& r1)
{
- typedef typename detail::chain_convert_impl::deduce_value<
+ typedef typename detail::chain_impl::deduce_value<
const Rng1,true
>::type val_;
- typedef detail::chain_convert_impl::first_expr_r<Rng1,val_> caller_;
+ typedef detail::chain_impl::first_expr_r<Rng1,val_> caller_;
return caller_::call(r1);
}
Modified: sandbox/statistics/detail/assign/boost/assign/chain_convert.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/chain_convert.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/chain_convert.hpp 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -10,6 +10,6 @@
#define BOOST_ASSIGN_CHAIN_CONVERT_ER_2010_HPP
#include <boost/assign/auto_size/range/chain.hpp>
-#include <boost/assign/auto_size/range/chain_convert.hpp>
+#include <boost/assign/auto_size/range/chain.hpp>
#endif
\ No newline at end of file
Modified: sandbox/statistics/detail/assign/libs/assign/doc/compilers_tested.txt
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/doc/compilers_tested.txt (original)
+++ sandbox/statistics/detail/assign/libs/assign/doc/compilers_tested.txt 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -35,6 +35,6 @@
check_ref_list_of_converter_set<int> Passed 10
check_ref_list_of_adapter_stack<int> Passed 11
check_ref_list_of_adapter_queue<int> Passed 12
- check_ref_list_of_chain_convert_r<int> Failed 13 4
- check_ref_list_of_chain_convert_l<int> Failed 14 5
+ check_ref_list_of_chain_r<int> Failed 13 4
+ check_ref_list_of_chain_l<int> Failed 14 5
check_ref_list_of_example2<int> Passed 15
Modified: sandbox/statistics/detail/assign/libs/assign/doc/patch.txt
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/doc/patch.txt (original)
+++ sandbox/statistics/detail/assign/libs/assign/doc/patch.txt 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -2,7 +2,7 @@
Add -R /boost/assign/auto_size
Add /boost/auto_size.hpp
-Add /boost/chain_convert.hpp
+Add /boost/chain.hpp
Add /libs/assign/test/ref_list_of.cpp
Add /libs/assign/test/ref_csv.cpp
Replace /libs/assign/test/Jamfile.v2
Modified: sandbox/statistics/detail/assign/libs/assign/doc/revision_history.txt
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/doc/revision_history.txt (original)
+++ sandbox/statistics/detail/assign/libs/assign/doc/revision_history.txt 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -2,14 +2,14 @@
//
// March 21, 2010 : Temporarily disable comparison_op until technical fix.
// March 21, 2010 : Removed /chain. Added /traits and /range. Implem of
-// chain_convert_l now much safer by keeping reference to previous changes and
+// chain_l now much safer by keeping reference to previous changes and
// the current range (similar to ref_list_of).
// March 19, 2010 : Finished /check
// March 18, 2010 : Commented out range() from auto_size::expr<>
// March 16, 2010 : Added a /comparison_op to allow comparison between proxy
// objects as well as between a proxy object and a range.
// March 14, 2010 : Made the chain interface similar to list_of as per MPG idea.
-// March 11, 2010 : Added range conversion and a chain_convert function.
+// March 11, 2010 : Added range conversion and a chain function.
// March 8, 2010 : Added a policy dispatcher, csv_policy, to allow a common
// policy tag for csv and non-csv functions.
// March 8, 2010 : Made array_interface derive from assign_detail::convert for
Modified: sandbox/statistics/detail/assign/libs/assign/example/range.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/example/range.cpp (original)
+++ sandbox/statistics/detail/assign/libs/assign/example/range.cpp 2010-03-25 22:14:13 EDT (Thu, 25 Mar 2010)
@@ -11,7 +11,7 @@
#include <boost/range/algorithm/copy.hpp>
#include <boost/assign/auto_size/ref_list_of.hpp>
#include <boost/assign/auto_size/range/basic_chain.hpp>
-#include <boost/assign/auto_size/range/chain_convert.hpp>
+#include <boost/assign/auto_size/range/chain.hpp>
#include <boost/assign/auto_size/range/convert_range.hpp>
#include <libs/assign/example/range.h>