|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70734 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/conversion boost/assign/v2/detail boost/assign/v2/interpreter boost/assign/v2/option boost/assign/v2/option/modifier boost/assign/v2/pipe boost/assign/v2/ref/wrapper libs/assign/v2/test/option
From: erwann.rogard_at_[hidden]
Date: 2011-03-29 21:34:29
Author: e_r
Date: 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
New Revision: 70734
URL: http://svn.boost.org/trac/boost/changeset/70734
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/conversion/convert.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp | 17 ++++++++++++-----
sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp | 1 -
sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp | 40 ++++++++++++++++++++--------------------
sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp | 8 ++++----
sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp | 12 +++---------
sandbox/assign_v2/boost/assign/v2/put.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp | 16 ++++++++--------
11 files changed, 53 insertions(+), 53 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/conversion/convert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/conversion/convert.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/conversion/convert.hpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -65,7 +65,7 @@
namespace result_of{
template<
- typename C // Container
+ typename C // Container
, typename R // Range
>
struct convert/*<-*/{ typedef C type; }/*->*/;
Modified: sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -17,19 +17,26 @@
//[syntax_detail_keyword
namespace keyword_aux{
+ struct use_default/*<-*/{}/*->*/;
+
struct ignore{
ignore(){}
template<typename Anything> ignore(Anything){}
};
- struct key{}/*->*/;
- struct nil{}/*->*/;
+ struct key/*<-*/{}/*->*/;
+ struct nil/*<-*/{}/*->*/;
}// keyword_aux
/*<-*/namespace{/*->*/
- const keyword_aux::ignore _ignore/*<-*/ = keyword_aux::ignore()/*->*/;
- const keyword_aux::key _key/*<-*/ = keyword_aux::key()/*->*/;
- const keyword_aux::nil _nil/*<-*/ = keyword_aux::nil()/*->*/;
+ const keyword_aux::use_default _use_default/*<-*/
+ = keyword_aux::use_default()/*->*/;
+ const keyword_aux::ignore _ignore/*<-*/
+ = keyword_aux::ignore()/*->*/;
+ const keyword_aux::key _key/*<-*/
+ = keyword_aux::key()/*->*/;
+ const keyword_aux::nil _nil/*<-*/
+ = keyword_aux::nil()/*->*/;
/*<-*/}/*->*/
//]
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/as_arg_list.hpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -51,7 +51,7 @@
struct as_arg_list/*<-*/
{
typedef as_arg_list_adapter<R> type;
- }/*->*/; // Metafunction
+ }/*->*/;
}// result_of
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -283,7 +283,6 @@
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
//->
-
};
}// interpreter_aux
Modified: sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -18,7 +18,7 @@
#include <boost/mpl/apply.hpp>
namespace boost{
- struct use_default;
+ struct use_default;
namespace assign{
namespace v2{
//[syntax_option_data_generator
@@ -29,35 +29,35 @@
>
struct deduce_key_generator/*<-*/
{
- typedef typename container_aux::key<C>::type key_;
+ typedef typename container_aux::key<C>::type key_;
typedef functor_aux::value<key_> type;
}/*->*/;
namespace result_of{
- template<typename D, typename C, typename F = use_default>
+ template<typename D, typename C, typename F = keyword_aux::use_default>
struct option_data_generator/*<-*/
- : ::boost::mpl::apply1<
- interpreter_aux::replace_data_generator<D>,
+ : ::boost::mpl::apply1<
+ interpreter_aux::replace_data_generator<D>,
F
>
{}/*->*/;
template<typename D, typename C>
- struct option_data_generator<D, C, use_default>/*<-*/
- : option_data_generator<
- D, C, typename deduce_data_generator<C>::type
+ struct option_data_generator<D, C, keyword_aux::use_default>/*<-*/
+ : option_data_generator<
+ D, C, typename deduce_data_generator<C>::type
>
{}/*->*/;
template<typename D, typename C>
struct option_data_generator<D, C, keyword_aux::key>/*<-*/
- : option_data_generator<
- D, C, typename deduce_key_generator<C>::type
+ : option_data_generator<
+ D, C, typename deduce_key_generator<C>::type
>
{}/*->*/;
-
+
}// result_of
template<typename F/*<-*/= keyword_aux::ignore/*->*/>
@@ -66,7 +66,7 @@
option_data_generator(){}
option_data_generator(F f) : f_( f ){}
- template<typename C>
+ template<typename C>
F const& data_generator()const{ return this->f_; }
private:
@@ -79,11 +79,11 @@
option_data_generator(){}
option_data_generator(keyword_aux::ignore){}
- template<typename C>
+ template<typename C>
typename deduce_data_generator<C>::type
data_generator()const
{
- return typename deduce_data_generator<C>::type();
+ return typename deduce_data_generator<C>::type();
}
}/*->*/;
@@ -94,29 +94,29 @@
option_data_generator(){}
option_data_generator(keyword_aux::ignore){}
- template<typename C>
+ template<typename C>
typename deduce_key_generator<C>::type
data_generator()const
{
- return typename deduce_key_generator<C>::type();
+ return typename deduce_key_generator<C>::type();
}
}/*->*/;
// Overrides data generator
template<typename C, typename F, typename ModifierTag
- , typename DataTag, typename D, typename F1>
+ , typename DataTag, typename D, typename F1>
typename result_of::option_data_generator<D, C, F1>::type
operator%(
interpreter_crtp<C, F, ModifierTag, DataTag, D> const& lhs,
option_data_generator<F1> const& rhs
)/*<-*/
{
- typedef typename result_of::option_data_generator<
- D, C, F1
+ typedef typename result_of::option_data_generator<
+ D, C, F1
>::type result_;
return result_(
- lhs.container(),
+ lhs.container(),
rhs.template data_generator<C>(),
lhs.modifier
);
Modified: sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -66,7 +66,7 @@
template<typename D,typename Keyword, typename Arg>
struct option_modifier /*<-*/ : ::boost::mpl::apply1<
- replace_modifier_tag<D>,
+ replace_modifier_tag<D>,
typename ::boost::mpl::apply1<
interpreter_aux::meta_modifier_tag<Keyword, Arg>,
D
@@ -84,11 +84,11 @@
option_modifier<Keyword, Arg> const& rhs
)/*<-*/
{
- typedef interpreter_aux::meta_modifier_tag<Keyword, Arg> meta_;
+ typedef interpreter_aux::meta_modifier_tag<Keyword, Arg> meta_;
typedef typename ::boost::mpl::apply1<meta_, D>::type modifier_tag;
typedef interpreter_aux::interpreter_modifier<modifier_tag> modifier_;
- typedef typename result_of::option_modifier<
- D, Keyword, Arg
+ typedef typename result_of::option_modifier<
+ D, Keyword, Arg
>::type result_;
return result_(
Modified: sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/pipe/csv_put.hpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -25,7 +25,6 @@
#include <boost/preprocessor/repetition.hpp>
#endif
-
namespace boost{
struct use_default;
namespace assign{
@@ -60,8 +59,8 @@
}/*->*/;
template<
- typename Head = typename empty_list_option::head_type,
- typename Tail = typename empty_list_option::tail_type
+ typename Head/*<-*/ = typename empty_list_option::head_type/*->*/,
+ typename Tail/*<-*/ = typename empty_list_option::tail_type/*->*/
>
class arg_list_generator : public list_option<Head, Tail>/*<-*/
{
@@ -174,16 +173,11 @@
}/*->*/;
-// TODO deal with maps
-
template<
typename C, typename H, typename T,
arg_list_size_type N, typename U
>
- C& operator|(
- C& cont,
- interpreter_aux::arg_list<H, T, N, U> const& arg_list
- )/*<-*/
+ C& operator|(C& cont, interpreter_aux::arg_list<H, T, N, U> const& arg_list)/*<-*/
{
typedef typename v2::result_of::put<
C
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-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -144,13 +144,13 @@
,typename C
>
typename result_of::put<C, DataGenerator, ModifierTag, DataTag>::type
- put( C& cont )/*<-*/
+ put( C& cont )
{
typedef typename result_of::put<
C, DataGenerator, ModifierTag, DataTag
>::type result_;
return result_( cont );
- }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
+ }
/*->*/
//]
Modified: sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/wrapper/copy.hpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -34,7 +34,7 @@
/*<-*/BOOST_STATIC_CONSTANT( bool, is_const = boost::is_const<T>::value );/*->*/
- BOOST_ASSIGN_V2_IGNORE(static bool is_const;)
+ /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/static bool is_const;/*<-*)/*->*/
wrapper()/*<-*/
{/*TODO or null pointer?*/}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
Modified: sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -39,7 +39,7 @@
typedef std::string str_; typedef std::map<str_, int> C; C year;
(
as2::put( year )( "feb", 28 )( "apr", 30 )( "jun", 30 )( "sep", 30 )( "nov", 30 )
- % (as2::_data = as2::_key) % ( as2::_mapped = ( _1 = 31 ) )
+ % (as2::_data = as2::_key) % ( as2::_mapped = ( _1 = 31 ) )
)/*<<Calls `year["jan"] = 31` etc.>>*/( "jan" )( "mar" )( "may" )( "jul" )( "aug" )( "oct" )( "dec" );
BOOST_ASSIGN_V2_CHECK( year["jan"] == 31 );
Modified: sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp 2011-03-29 21:34:28 EDT (Tue, 29 Mar 2011)
@@ -58,18 +58,18 @@
{
// fully qual boost::begin/end demanded by MSVC - error C2668
//[test_option_push_front
- boost::circular_buffer<int> cb(3);
- ( as2::put( cb ) % as2::_push_front)( 3 )( 2 )( 1 );
+ boost::circular_buffer<int> cb(3);
+ ( as2::put( cb ) % as2::_push_front)( 3 )( 2 )( 1 );
- BOOST_ASSIGN_V2_CHECK(
- range::equal(cb, as2::csv_deque(1, 2, 3) )
- );
+ BOOST_ASSIGN_V2_CHECK(
+ range::equal(cb, as2::csv_deque(1, 2, 3) )
+ );
as2::put( cb )( 4 )( 5 );
- BOOST_ASSIGN_V2_CHECK(
- range::equal(cb, as2::csv_deque(3, 4, 5) )
- );
+ BOOST_ASSIGN_V2_CHECK(
+ range::equal(cb, as2::csv_deque(3, 4, 5) )
+ );
//]
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