|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r72508 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque/cpp03 boost/assign/v2/deque/csv_deque boost/assign/v2/include boost/assign/v2/put boost/assign/v2/put/cpp03 boost/assign/v2/support libs/assign/v2 libs/assign/v2/speed libs/assign/v2/test libs/assign/v2/test/deque libs/assign/v2/test/option libs/assign/v2/test/put libs/assign/v2/test/unit_testing
From: erwann.rogard_at_[hidden]
Date: 2011-06-09 11:35:07
Author: e_r
Date: 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
New Revision: 72508
URL: http://svn.boost.org/trac/boost/changeset/72508
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_basic.hpp | 10 +
sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_ext.hpp | 2
sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp | 6 +
sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp | 6 +
sandbox/assign_v2/boost/assign/v2/include/delay_csv_put.hpp | 2
sandbox/assign_v2/boost/assign/v2/include/delay_put.hpp | 2
sandbox/assign_v2/boost/assign/v2/put.hpp | 4
sandbox/assign_v2/boost/assign/v2/put/cpp03/delay_csv_put.hpp | 24 ++--
sandbox/assign_v2/boost/assign/v2/put/delay_csv_put.hpp | 128 ------------------------------
sandbox/assign_v2/boost/assign/v2/put/delay_put.hpp | 164 ---------------------------------------
sandbox/assign_v2/boost/assign/v2/support/speed.hpp | 8
sandbox/assign_v2/libs/assign/v2/speed/test.cpp | 16 +-
sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_ext.cpp | 38 +++------
sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp | 4
sandbox/assign_v2/libs/assign/v2/test/put.cpp | 8
sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp | 12 +-
sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.h | 4
sandbox/assign_v2/libs/assign/v2/test/put/delay_put.cpp | 22 ++--
sandbox/assign_v2/libs/assign/v2/test/put/delay_put.h | 4
sandbox/assign_v2/libs/assign/v2/test/unit_testing/deque.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp | 10 +-
sandbox/assign_v2/libs/assign/v2/tutorial.cpp | 10 +-
22 files changed, 100 insertions(+), 386 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_basic.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_basic.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_basic.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -18,7 +18,10 @@
#define BOOST_ASSIGN_V2_CSV_DEQUE_OVERLOAD_BASIC(z, N, is_const)\
template<typename T, typename Options BOOST_PP_ENUM_TRAILING_PARAMS(N, typename T)>\
- typename result_of::csv_deque_option<T, Options>::type\
+ typename boost::lazy_enable_if<\
+ is_option<Options>,\
+ result_of::csv_deque_option<T, Options>\
+ >::type\
csv_deque(\
BOOST_PP_ENUM_BINARY_PARAMS(N, T, BOOST_PP_EXPR_IF(is_const, const)& _)\
)\
@@ -55,7 +58,10 @@
#define BOOST_ASSIGN_V2_MACRO(z, i, data) const T& BOOST_PP_CAT(_,i)
#define BOOST_ASSIGN_V2_CSV_DEQUE_OVERLOAD_BASIC_IMPLICIT(z, N, is_const)\
template<typename T, typename Options>\
- typename result_of::csv_deque_option<T, Options>::type\
+ typename boost::lazy_enable_if<\
+ is_option<Options>,\
+ result_of::csv_deque_option<T, Options>\
+ >::type\
csv_deque( BOOST_PP_ENUM(N, BOOST_ASSIGN_V2_MACRO, ~) )\
{\
typedef typename csv_deque_deduce_value<T>::type t_;\
Modified: sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_ext.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_ext.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/cpp03/csv_deque_ext.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -42,7 +42,7 @@
int I, BOOST_ASSIGN_V2_TPL_PARAMETER_LIST(SeqU)\
>\
typename boost::lazy_enable_if_c<\
- I == BOOST_PP_SEQ_SIZE(SeqU),\
+ ( I == BOOST_PP_SEQ_SIZE(SeqU) ) && ( is_option<Options>::value ),\
result_of::csv_deque_option<T, Options>\
>::type csv_deque\
(\
Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -14,6 +14,7 @@
#include <boost/assign/v2/option/list.hpp>
#include <boost/assign/v2/support/config/enable_cpp0x.hpp>
#include <boost/assign/v2/support/pp/ignore.hpp>
+#include <boost/utility/enable_if.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <utility>
@@ -36,7 +37,10 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
template<typename T, typename Options, typename... Args>
- typename result_of::csv_deque_option<T, Options>::type
+ typename boost::lazy_enable_if<
+ is_option<Options>,
+ result_of::csv_deque_option<T, Options>
+ >::type
csv_deque(Args&& ... args)/*<-*/
{
typename result_of::csv_deque_option<T, Options>::type result;
Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -14,6 +14,7 @@
#include <boost/assign/v2/option/list.hpp>
#include <boost/assign/v2/support/config/enable_cpp0x.hpp>
#include <boost/assign/v2/support/pp/ignore.hpp>
+#include <boost/utility/enable_if.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <utility>
@@ -33,7 +34,10 @@
template<typename T,
typename Options, int I, typename...Types, typename... Args>
- typename result_of::csv_deque_option<T, Options>::type
+ typename boost::enable_if<
+ is_option<Options>,
+ result_of::csv_deque_option<T, Options>
+ >::type
csv_deque(Args&& ... args)/*<-*/
{
typename result_of::csv_deque_option<T, Options>::type result;
Modified: sandbox/assign_v2/boost/assign/v2/include/delay_csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/delay_csv_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/delay_csv_put.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -9,5 +9,5 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_DELAY_CSV_PUT_ER_2011_HPP
#define BOOST_ASSIGN_V2_INCLUDE_DELAY_CSV_PUT_ER_2011_HPP
-#include <boost/assign/v2/put/delay_csv_put.hpp>
+#include <boost/assign/v2/put/do_csv_put.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_DELAY_CSV_PUT_ER_2011_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/delay_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/delay_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/delay_put.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -9,5 +9,5 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_DELAY_PUT_ER_2011_HPP
#define BOOST_ASSIGN_V2_INCLUDE_DELAY_PUT_ER_2011_HPP
-#include <boost/assign/v2/put/delay_put.hpp>
+#include <boost/assign/v2/put/do_put.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_DELAY_PUT_ER_2011_HPP
Modified: sandbox/assign_v2/boost/assign/v2/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -10,8 +10,8 @@
#ifndef BOOST_ASSIGN_V2_PUT_ER_2011_HPP
#define BOOST_ASSIGN_V2_PUT_ER_2011_HPP
#include <boost/assign/v2/put/csv_put.hpp>
-#include <boost/assign/v2/put/delay_csv_put.hpp>
-#include <boost/assign/v2/put/delay_put.hpp>
+#include <boost/assign/v2/put/do_csv_put.hpp>
+#include <boost/assign/v2/put/do_put.hpp>
#include <boost/assign/v2/put/put.hpp>
#endif // BOOST_ASSIGN_V2_PUT_ER_2011_HPP
Modified: sandbox/assign_v2/boost/assign/v2/put/cpp03/delay_csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/cpp03/delay_csv_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/cpp03/delay_csv_put.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -12,7 +12,7 @@
#include <boost/assign/v2/support/config/limit_csv_arity.hpp>
#include <boost/assign/v2/support/config/limit_tuple_arity.hpp>
#include <boost/assign/v2/support/pp/parameter_list.hpp>
-#include <boost/assign/v2/put/delay_csv_put.hpp>
+#include <boost/assign/v2/put/do_csv_put.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/add_reference.hpp>
@@ -24,12 +24,12 @@
namespace result_of{
template<typename T>
- struct delay_csv_put_elem
+ struct do_csv_put_elem
: boost::add_reference<T>
{};
template<>
- struct delay_csv_put_elem<boost::tuples::null_type>
+ struct do_csv_put_elem<boost::tuples::null_type>
{
typedef boost::tuples::null_type type;
};
@@ -43,10 +43,10 @@
boost::tuples::null_type
)
>
- struct delay_csv_put
+ struct do_csv_put
{
#define BOOST_ASSIGN_V2_MACRO(z, i, data)\
- typename delay_csv_put_elem<BOOST_PP_CAT(T,i)>::type\
+ typename do_csv_put_elem<BOOST_PP_CAT(T,i)>::type\
/**/
typedef boost::tuple<
BOOST_PP_ENUM(
@@ -74,18 +74,18 @@
>\
typename boost::lazy_enable_if_c<\
I == BOOST_PP_SEQ_SIZE(SeqU),\
- result_of::delay_csv_put<\
+ result_of::do_csv_put<\
Options,\
I,\
BOOST_PP_SEQ_ENUM(SeqU)\
>\
>::type\
- delay_csv_put\
+ do_csv_put\
(\
BOOST_ASSIGN_V2_CSV_PARAMETER_LIST(SeqU, N)\
)\
{\
- typedef result_of::delay_csv_put<\
+ typedef result_of::do_csv_put<\
Options,\
I,\
BOOST_PP_SEQ_ENUM(SeqU)\
@@ -109,18 +109,18 @@
template<int I, BOOST_ASSIGN_V2_TPL_PARAMETER_LIST(SeqU)>\
typename boost::lazy_enable_if_c<\
I == BOOST_PP_SEQ_SIZE(SeqU),\
- result_of::delay_csv_put<\
+ result_of::do_csv_put<\
empty_list_option_,\
I,\
BOOST_PP_SEQ_ENUM(SeqU)\
>\
>::type\
- delay_csv_put\
+ do_csv_put\
(\
BOOST_ASSIGN_V2_CSV_PARAMETER_LIST(SeqU, N)\
)\
{\
- return delay_csv_put<\
+ return do_csv_put<\
empty_list_option_,\
I,\
BOOST_PP_SEQ_ENUM(SeqU)\
@@ -183,7 +183,7 @@
#undef BOOST_ASSIGN_V2_DELAY_CSV_PUT_OVERLOAD
}// interpreter_aux
-using interpreter_aux::delay_csv_put;
+using interpreter_aux::do_csv_put;
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/put/delay_csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/delay_csv_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/delay_csv_put.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -1,127 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2011 Erwann Rogard //
-// 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) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_PUT_DELAY_CSV_PUT_ER_2011_HPP
-#define BOOST_ASSIGN_V2_PUT_DELAY_CSV_PUT_ER_2011_HPP
-#include <boost/assign/v2/deque/csv_deque.hpp>
-#include <boost/assign/v2/put/delay_put.hpp>
-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-#include <utility>
-#include <tuple>
-#include <boost/assign/v2/support/pp/ignore.hpp>
-#include <boost/assign/v2/support/traits/type/add_ref_const.hpp>
-#include <boost/assign/v2/support/mpl/variadic_args_to_indices.hpp>
-#include <boost/type_traits/add_const.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-//[syntax_delay_csv_put
-namespace interpreter_aux{
-namespace result_of{
-
-//<-
- template<typename Options, int I>
- struct delay_csv_put_helper
- {
- template<typename CastHolder, typename ArgsHolder>
- struct apply{};
-
- template<typename...Cast, typename... Args>
- struct apply<pack_holder<Cast...>, pack_holder<Args...> >
- {
- typedef pack_holder<
- typename type_traits::add_ref_const<Cast>::type...
- > head_;
- typedef pack_holder<Args...> tail_;
- typedef typename csv_cast<I, head_, tail_>::type cast_;
-
- typedef typename csv_tuple_head<
- I, pack_holder<>, pack_holder<Args...>
- >::type tuple_;
- typedef typename result_of::csv_deque<tuple_>::type cont_;
- typedef put_for_each_adapter<
- typename boost::add_const<cont_>::type,
- Options,
- I
- > type;
-
- static type call(Options const& options, Args&&... args)
- {
- return type( options, v2::csv_deque<tuple_, I>(
- std::forward<Args>( args )...
- ) );
- }
- };
- };
-
-//->
- template<
- typename Options,
- typename CastHolder, typename ArgsHolder,
- int I
- >
- struct delay_csv_put/*<-*/
- : delay_csv_put_helper<Options, I>:: template apply<
- CastHolder, ArgsHolder
- >
- {}/*->*/;
-
-}// result_of
-
- template<typename Options, int I, typename ...Cast, typename...Args>
-/*<-*/
- typename result_of::delay_csv_put<
- Options,
- pack_holder<Cast...>,
- pack_holder<Args...>,
- I
- >::type/*->*/
- /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified/*<-*/)/*->*/
- delay_csv_put(Args&&... args)/*<-*/
- {
- typedef result_of::delay_csv_put<
- Options,
- pack_holder<Cast...>,
- pack_holder<Args...>,
- I
- > meta_;
- return meta_::call( Options(), std::forward<Args>( args )... );
- }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
- template<int I, typename ...Cast, typename...Args>
-/*<-*/
- typename result_of::delay_csv_put<
- empty_list_option_,
- pack_holder<Cast...>,
- pack_holder<Args...>,
- I
- >::type/*->*/
- /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified/*<-*/)/*->*/
- delay_csv_put(Args&&... args)/*<-*/
- {
- return delay_csv_put<empty_list_option_, I, Cast...>(
- std::forward<Args>(args)...
- );
- }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
-}// interpreter_aux
-
-using interpreter_aux::delay_csv_put;
-
-//]
-}// v2
-}// assign
-}// boost
-
-#else
-#include <boost/assign/v2/put/cpp03/delay_csv_put.hpp>
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-#endif // BOOST_ASSIGN_V2_PUT_DELAY_CSV_PUT_ER_2011_HPP
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/put/delay_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/delay_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/delay_put.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -1,163 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2011 Erwann Rogard //
-// 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) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_PUT_DELAY_PUT_ER_2011_HPP
-#define BOOST_ASSIGN_V2_PUT_DELAY_PUT_ER_2011_HPP
-#include <boost/assign/v2/support/pp/ignore.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/assign/v2/put/put.hpp>
-#include <boost/assign/v2/support/pp/forward.hpp>
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-#include <utility>
-#endif
-
-namespace boost{
-namespace assign{
-namespace v2{
-//[syntax_delay_put
-namespace interpreter_aux{
-
-//<-
- template<typename R>
- struct delay_put_super
- {
- typedef boost::iterator_range<
- typename boost::range_iterator<
- typename type_traits::param<R>::type
- >::type
- > type;
- };
-//->
-
- template<
- typename R, typename O = empty_list_option_/*<-*/, int I = 0/*->*/
- >
- struct put_for_each_adapter/*<-*/
- : delay_put_super<R>::type/*->*/
- {
-//<-
- typedef typename delay_put_super<R>::type super_t;
-
- public:
-
- put_for_each_adapter( BOOST_ASSIGN_V2_FORWARD_PARAM(R, range) )
- :super_t( BOOST_ASSIGN_V2_FORWARD_ARG(R, range) )
- {}
-
- put_for_each_adapter(
- O const& o, BOOST_ASSIGN_V2_FORWARD_PARAM(R, range)
- )
- :super_t( BOOST_ASSIGN_V2_FORWARD_ARG(R, range) ),
- options_( o )
- {}
-
- put_for_each_adapter(super_t const& super, O const& o)
- :super_t( super ), options_( o )
- {}
-
- O const& options()const{ return this->options_; }
-
- private:
- put_for_each_adapter();
- O options_;
-//->
- };
-
- template<typename O = empty_list_option_>
- struct put_adapter
- {
-//<-
- put_adapter(){}
- put_adapter(O const& o)
- :options_( o )
- {}
-//->
-
- template<typename R>
- put_for_each_adapter<R, O>
- for_each( /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/R&& range/*<-*/)
- BOOST_ASSIGN_V2_FORWARD_PARAM( R, range )/*->*/ )const/*<-*/
- {
- typedef put_for_each_adapter<R, O> result_;
- return result_( this->options_, range );
- }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
- template<int I, typename R>
- put_for_each_adapter<R, O, I>
- for_each( /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/R&& range/*<-*/)
- BOOST_ASSIGN_V2_FORWARD_PARAM( R, range )/*->*/ )const/*<-*/
- {
- typedef put_for_each_adapter<R, O, I> result_;
- return result_( this->options_, range );
- }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
- template<typename Options>
- put_adapter<Options>
- operator%(Options const& options) const/*<-*/
- {
- return put_adapter<Options>( options );
- }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-//<-
-#if! BOOST_ASSIGN_V2_ENABLE_CPP0X
-
- // R const&
-
- template<typename R>
- put_for_each_adapter<R const, O>
- for_each( R const& range )const
- {
- typedef put_for_each_adapter<R const, O> result_;
- return result_( this->options_, range );
- }
-
- template<int I, typename R>
- put_for_each_adapter<R const, O, I>
- for_each( R const& range )const
- {
- typedef put_for_each_adapter<R const, O, I> result_;
- return result_( this->options_, range );
- }
-#endif
- private:
- O options_;
-//->
- };
-
- template<typename C, typename R, typename O>
- C& operator|(C& cont, put_for_each_adapter<R, O> const& a)/*<-*/
- {
- return (
- put( cont ) % a.options()
- ).for_each( a ).container();
- }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
- template<typename C, typename R, typename O, int I>
- C& operator|(C& cont, put_for_each_adapter<R, O, I> const& a)/*<-*/
- {
- return (
- put( cont ) % a.options()
- ).template for_each<I>( a ).container();
- }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-
-}// interpreter_aux
-
-//<-
-namespace{
-//->
- const interpreter_aux::put_adapter<> _delay_put/*<-*/
- = interpreter_aux::put_adapter<>()/*->*/;
-//<-
-}
-//->
-//]
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_PUT_DELAY_PUT_ER_2011_HPP
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/support/speed.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/support/speed.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/support/speed.hpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -124,13 +124,13 @@
// V2-PIPE_PUT
template<typename Timer, typename E, typename C, typename... Args>
-void v2_delay_put_for_each(std::size_t n, E& elapsed, C& cont, Args&&... args)
+void v2_do_put_for_each(std::size_t n, E& elapsed, C& cont, Args&&... args)
{
Timer timer;
for(std::size_t i = 0; i < n; i++)
{
cont.clear();
- cont | v2::_delay_put.for_each(
+ cont | v2::_do_put.for_each(
v2::csv_deque( std::forward<Args>( args )... )
);
}
@@ -155,13 +155,13 @@
// V2-PIPE-CSV_PUT
template<typename Timer, typename E, typename C, typename... Args>
-void v2_delay_csv_put(std::size_t n, E& elapsed, C& cont, Args&&... args)
+void v2_do_csv_put(std::size_t n, E& elapsed, C& cont, Args&&... args)
{
Timer timer;
for(std::size_t i = 0; i < n; i++)
{
cont.clear();
- cont | v2::delay_csv_put<1>( std::forward<Args>( args )... );
+ cont | v2::do_csv_put<1>( std::forward<Args>( args )... );
}
elapsed = timer.elapsed();
assert( cont.size() == sizeof...( Args ) );
Modified: sandbox/assign_v2/libs/assign/v2/speed/test.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/speed/test.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/speed/test.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -183,13 +183,13 @@
n, elapsed, cont, std::forward<Args>( args )... ),
"v2_csv_put"
)
- MACRO( as2::speed_aux::v2_delay_put_for_each<timer_>(
+ MACRO( as2::speed_aux::v2_do_put_for_each<timer_>(
n, elapsed, cont, std::forward<Args>( args )... ),
- "v2_delay_put_for_each"
+ "v2_do_put_for_each"
)
- MACRO( as2::speed_aux::v2_delay_csv_put<timer_>(
+ MACRO( as2::speed_aux::v2_do_csv_put<timer_>(
n, elapsed, cont, std::forward<Args>( args )... ),
- "v2_delay_csv_put"
+ "v2_do_csv_put"
)
// Generate containers
@@ -246,9 +246,9 @@
cols["stl_push_back"] = "cont.push_back( arg1 ); ...; cont.push_back( argm )";
cols["v1_push_back"] = "push_back( cont )( arg1 )...( argm )";
cols["v2_put"] = "v2::put( cont )( arg1 )...( argm )";
- cols["v2_delay_put_for_each"] = "cont | v2::_delay_put.for_each( v2::csv_deque( args... ) )";
+ cols["v2_do_put_for_each"] = "cont | v2::_do_put.for_each( v2::csv_deque( args... ) )";
cols["v2_csv_put"] = "cont | v2::csv_put( cont, args )";
- cols["v2_delay_csv_put"] = "cont | v2::delay_csv_put( args... )";
+ cols["v2_do_csv_put"] = "cont | v2::do_csv_put( args... )";
cols["v1_list_of"] = "list_of( arg1 )...( argm )";
cols["v2_deque"] = "v2::deque<T>( arg1 )...( argm )";
cols["v2_csv_deque"] = "v2::csv_deque( args... )";
@@ -303,8 +303,8 @@
methods.push_back( "v1_push_back" );
methods.push_back( "v2_put" );
methods.push_back( "v2_csv_put" );
- methods.push_back( "v2_delay_put_for_each" );
- methods.push_back( "v2_delay_csv_put" );
+ methods.push_back( "v2_do_put_for_each" );
+ methods.push_back( "v2_do_csv_put" );
methods.push_back( "v1_list_of" );
methods.push_back( "v2_deque" );
Modified: sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_ext.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_ext.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/deque/csv_deque_ext.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -27,20 +27,20 @@
void test()
{
namespace as2 = boost::assign::v2;
+//<-
+#if BOOST_ASSIGN_V2_ENABLE_CPP0X
+ using std;
+#else
+ using boost;
+#endif
+//->
+
{
//[test_csv_deque_ext1
typedef const char state_ [3]; typedef int code_;
state_ ct = "CT", nj = "NJ", ny = "NY";
-//<-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
- typedef std::tuple<state_/*<<Notice the reference>>*/&, code_> data_;
-//<-
-#else
- typedef boost::tuple<state_&, code_> data_;
-#endif
-//->
+ typedef tuple<state_/*<<Notice the reference>>*/&, code_> data_;
as2::result_of::deque<
data_
@@ -50,23 +50,11 @@
ct, 203
);
-//<-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
- BOOST_ASSIGN_V2_CHECK( std::get<0>( region.front() ) == ny );
- BOOST_ASSIGN_V2_CHECK( std::get<1>( region.back() ) == 203 );
- BOOST_ASSIGN_V2_CHECK( std::get<1>( region.front() ) == 212 );
- BOOST_ASSIGN_V2_CHECK( std::get<0>( region.back() ) == ct );
-//<-
-#endif
-//->
+ BOOST_ASSIGN_V2_CHECK( get<0>( region.front() ) == ny );
+ BOOST_ASSIGN_V2_CHECK( get<1>( region.back() ) == 203 );
+ BOOST_ASSIGN_V2_CHECK( get<1>( region.front() ) == 212 );
+ BOOST_ASSIGN_V2_CHECK( get<0>( region.back() ) == ct );
//]
-#if! BOOST_ASSIGN_V2_ENABLE_CPP0X
- BOOST_ASSIGN_V2_CHECK( boost::get<0>( region.front() ) == ny );
- BOOST_ASSIGN_V2_CHECK( boost::get<1>( region.back() ) == 203 );
- BOOST_ASSIGN_V2_CHECK( boost::get<1>( region.front() ) == 212 );
- BOOST_ASSIGN_V2_CHECK( boost::get<0>( region.back() ) == ct );
-#endif
}
}
Modified: sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -12,7 +12,7 @@
#include <boost/assign/v2/support/config/check.hpp>
#include <boost/assign/v2/include/csv_basic.hpp>
#include <boost/assign/v2/include/put.hpp>
-#include <boost/assign/v2/include/delay_put.hpp>
+#include <boost/assign/v2/include/do_put.hpp>
#include <boost/assign/v2/option/modifier/std.hpp>
#include <boost/assign/v2/option/modifier/repeat.hpp>
#include <boost/assign/v2/deque.hpp>
@@ -35,7 +35,7 @@
BOOST_ASSIGN_V2_CHECK(
boost::range::equal(
cont | (
- as2::_delay_put % _modifier
+ as2::_do_put % _modifier
).for_each( as2::csv_deque(1, 10, 100) ),
as2::csv_deque( 1, 1, 10, 10, 100, 100 )
)
Modified: sandbox/assign_v2/libs/assign/v2/test/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -9,8 +9,8 @@
//////////////////////////////////////////////////////////////////////////////
#include <libs/assign/v2/test/put/csv_put_basic.h>
#include <libs/assign/v2/test/put/csv_put_ext.h>
-#include <libs/assign/v2/test/put/delay_csv_put.h>
-#include <libs/assign/v2/test/put/delay_put.h>
+#include <libs/assign/v2/test/put/do_csv_put.h>
+#include <libs/assign/v2/test/put/do_put.h>
#include <libs/assign/v2/test/put/put.h>
#include <libs/assign/v2/test/put.h>
@@ -21,8 +21,8 @@
xxx_csv_put_basic::test();
xxx_csv_put_ext::test();
- xxx_delay_csv_put::test();
- xxx_delay_put::test();
+ xxx_do_csv_put::test();
+ xxx_do_put::test();
xxx_put::test();
}
Modified: sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -8,13 +8,13 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
#include <map>
-#include <boost/assign/v2/include/delay_csv_put.hpp>
+#include <boost/assign/v2/include/do_csv_put.hpp>
#include <boost/assign/v2/support/config/check.hpp>
-#include <libs/assign/v2/test/put/delay_csv_put.h>
+#include <libs/assign/v2/test/put/do_csv_put.h>
namespace test_assign_v2{
namespace xxx_put{
-namespace xxx_delay_csv_put{
+namespace xxx_do_csv_put{
void test(){
namespace as2 = boost::assign::v2;
@@ -22,7 +22,7 @@
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
// MAP
{
- //[test_delay_csv_put1
+ //[test_do_csv_put1
typedef std::string month_;
typedef int days_;
std::map<month_, days_> q1, benchmark;
@@ -34,7 +34,7 @@
BOOST_ASSIGN_V2_CHECK(
boost::range::equal(
benchmark,
- q1 | as2::delay_csv_put<2>( "jan", 31, "feb", 28, "mar", 31 )
+ q1 | as2::do_csv_put<2>( "jan", 31, "feb", 28, "mar", 31 )
)
);
//]
@@ -42,6 +42,6 @@
#endif
}// test()
-}// xxx_delay_put
+}// xxx_do_put
}// xxx_put
}// xxx_test_assign
Modified: sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.h (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.h 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -12,11 +12,11 @@
namespace test_assign_v2{
namespace xxx_put{
-namespace xxx_delay_csv_put{
+namespace xxx_do_csv_put{
void test();
-}// xxx_delay_csv_put
+}// xxx_do_csv_put
}// xxx_put
}// xxx_test_assign
Modified: sandbox/assign_v2/libs/assign/v2/test/put/delay_put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/delay_put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/delay_put.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -13,7 +13,7 @@
#include <boost/assign/v2/include/csv_deque_basic.hpp>
#include <boost/assign/v2/include/csv_deque_ext.hpp>
-#include <boost/assign/v2/include/delay_put.hpp>
+#include <boost/assign/v2/include/do_put.hpp>
#include <boost/assign/v2/support/config/check.hpp>
#include <boost/assign/v2/support/config/enable_cpp0x.hpp>
#include <boost/circular_buffer.hpp>
@@ -25,36 +25,36 @@
#include <boost/tuple/tuple.hpp>
#endif
-#include <libs/assign/v2/test/put/delay_put.h>
+#include <libs/assign/v2/test/put/do_put.h>
namespace test_assign_v2{
namespace xxx_put{
-namespace xxx_delay_put{
+namespace xxx_do_put{
void test(){
namespace as2 = boost::assign::v2;
{
- //[test_delay_put1
+ //[test_do_put1
boost::circular_buffer<int> cb(3);
BOOST_ASSIGN_V2_CHECK(
boost::range::equal(
- cb | as2::_delay_put.for_each( as2::csv_deque(1 ,2, 3) )
+ cb | as2::_do_put.for_each( as2::csv_deque(1 ,2, 3) )
, as2::csv_deque(1, 2, 3)
)
);
BOOST_ASSIGN_V2_CHECK(
boost::range::equal(
- cb | as2::_delay_put.for_each( as2::csv_deque( 4, 5 ) ),
+ cb | as2::_do_put.for_each( as2::csv_deque( 4, 5 ) ),
as2::csv_deque( 3, 4, 5 )
)
);
//]
}
{
- //[test_delay_put2
+ //[test_do_put2
typedef std::string month_; typedef int days_;
typedef std::pair<month_, days_> p_;
//<-
@@ -70,7 +70,7 @@
BOOST_ASSIGN_V2_CHECK(
boost::range::equal(
- q1 | as2::_delay_put.for_each<2>(
+ q1 | as2::_do_put.for_each<2>(
as2::csv_deque<t_, 2>(
"jan", 31, "feb", 28, "mar", 31
)
@@ -83,7 +83,7 @@
//]
}
{
- //[test_delay_put3
+ //[test_do_put3
typedef std::string month_;
typedef int days_;
std::map<month_, days_> q1, benchmark;
@@ -102,7 +102,7 @@
//->
BOOST_ASSIGN_V2_CHECK(
boost::range::equal(
- q1 | as2::_delay_put.for_each<2>(
+ q1 | as2::_do_put.for_each<2>(
as2::csv_deque<t_, 2>(
"jan", 31, "feb", 28, "mar", 31
)
@@ -114,6 +114,6 @@
}
}// test()
-}// xxx_delay_put
+}// xxx_do_put
}// xxx_put
}// xxx_test_assign
Modified: sandbox/assign_v2/libs/assign/v2/test/put/delay_put.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/delay_put.h (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/delay_put.h 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -12,11 +12,11 @@
namespace test_assign_v2{
namespace xxx_put{
-namespace xxx_delay_put{
+namespace xxx_do_put{
void test();
-}// xxx_delay_put
+}// xxx_do_put
}// xxx_put
}// xxx_test_assign
Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/deque.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/deque.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/deque.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -24,9 +24,9 @@
using namespace test_assign_v2;
{
namespace ns = xxx_deque;
+ test->add( BOOST_TEST_CASE( &ns::xxx_deque::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_csv_deque_basic::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_csv_deque_ext::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_deque::test ) );
}
return test;
}
Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -16,8 +16,8 @@
#include <libs/assign/v2/test/put/csv_put_basic.cpp>
#include <libs/assign/v2/test/put/csv_put_ext.cpp>
#include <libs/assign/v2/test/put/put.cpp>
-#include <libs/assign/v2/test/put/delay_csv_put.cpp>
-#include <libs/assign/v2/test/put/delay_put.cpp>
+#include <libs/assign/v2/test/put/do_csv_put.cpp>
+#include <libs/assign/v2/test/put/do_put.cpp>
#include <boost/test/unit_test.hpp>
using boost::unit_test::test_suite;
@@ -27,11 +27,11 @@
using namespace test_assign_v2;
{
namespace ns = xxx_put;
+ test->add( BOOST_TEST_CASE( &ns::xxx_put::test ) );
+ test->add( BOOST_TEST_CASE( &ns::xxx_do_put::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_csv_put_basic::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_csv_put_ext::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_put::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_delay_put::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_delay_csv_put::test ) );
+ test->add( BOOST_TEST_CASE( &ns::xxx_do_csv_put::test ) );
}
return test;
}
Modified: sandbox/assign_v2/libs/assign/v2/tutorial.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/tutorial.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/tutorial.cpp 2011-06-09 11:35:05 EDT (Thu, 09 Jun 2011)
@@ -56,12 +56,12 @@
//]
}
{
- //[test_delay_csv_put_map
+ //[test_do_csv_put_map
typedef std::map<std::string, int> map_; map_ cal;
typedef map_::value_type p_;
boost::for_each(
- /*<<Calls `cal.insert( p_( k, x ) );` for each [^( k, x )] pair in the argurment list, and returns `cal`>>*/cal | delay_csv_put<2>( "jan", 31, "feb", 28, "mar", 31 ),
+ /*<<Calls `cal.insert( p_( k, x ) );` for each [^( k, x )] pair in the argurment list, and returns `cal`>>*/cal | do_csv_put<2>( "jan", 31, "feb", 28, "mar", 31 ),
std::cout
<< lambda::bind( &p_::first, lambda::_1 ) << ':'
<< lambda::bind( &p_::second, lambda:: _1 ) << ' '
@@ -69,11 +69,11 @@
//]
}
{
- //[tutorial_delay_put
+ //[tutorial_do_put
std::deque<int> source( 6 ), target; iota( source, 0 );
range::stable_partition(
- target | _delay_put.for_each( source ),
+ target | _do_put.for_each( source ),
lambda::_1 % 2
);
//]
@@ -205,7 +205,7 @@
assert(
range::equal(
- cb | delay_csv_put<push_front_, 1>( 3, 2, 1 ),
+ cb | do_csv_put<push_front_, 1>( 3, 2, 1 ),
csv_deque( 1, 2, 3 )
)
);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk