|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70729 - in sandbox/assign_v2: boost/assign/v2/deque boost/assign/v2/deque/cpp03 boost/assign/v2/detail boost/assign/v2/detail/functor boost/assign/v2/detail/keyword boost/assign/v2/interpreter boost/assign/v2/option boost/assign/v2/option/modifier boost/assign/v2/ref/array boost/assign/v2/ref/aux_/list libs/assign/v2/test/option libs/assign/v2/test/pipe libs/assign/v2/test/pipe/option
From: erwann.rogard_at_[hidden]
Date: 2011-03-29 20:01:31
Author: e_r
Date: 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
New Revision: 70729
URL: http://svn.boost.org/trac/boost/changeset/70729
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/deque/cpp03/deque.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/deque/deque.hpp | 30 +++++++++++++++---------------
sandbox/assign_v2/boost/assign/v2/detail/functor/value.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/keyword.hpp | 27 ++++++++++++++++++++++++---
sandbox/assign_v2/boost/assign/v2/detail/keyword/ignore.hpp | 33 +--------------------------------
sandbox/assign_v2/boost/assign/v2/detail/keyword/key.hpp | 31 +------------------------------
sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp | 31 +------------------------------
sandbox/assign_v2/boost/assign/v2/interpreter/crtp.hpp | 12 ++++++------
sandbox/assign_v2/boost/assign/v2/interpreter/data_generator.hpp | 11 +++++------
sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp | 20 ++++++++++----------
sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp | 28 ++++++++++++++--------------
sandbox/assign_v2/boost/assign/v2/option/data_generator.hpp | 5 ++---
sandbox/assign_v2/boost/assign/v2/option/modifier/framework.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/option/modifier/insert.hpp | 8 ++++----
sandbox/assign_v2/boost/assign/v2/option/modifier/iterate.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/option/modifier/mapped.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/option/modifier/std.hpp | 12 ++++++------
sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/ref/aux_/list/list.hpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/option/list.cpp | 12 ++++++------
sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp | 2 +-
sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp | 14 +++++++-------
sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp | 16 ++++++++--------
23 files changed, 119 insertions(+), 189 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/deque/cpp03/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/cpp03/deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/cpp03/deque.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -11,7 +11,7 @@
#define BOOST_ASSIGN_V2_DEQUE_CPP03_DEQUE_ER_2010_HPP
#include <boost/assign/v2/detail/config/limit_arity.hpp>
#include <boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp>
-#include <boost/assign/v2/detail/keyword/nil.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/pp/parameter_list.hpp>
#include <boost/assign/v2/deque/fwd.hpp>
#include <boost/preprocessor/arithmetic.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/deque/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/deque.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -16,7 +16,7 @@
#include <boost/assign/v2/interpreter/replace.hpp>
#include <boost/assign/v2/deque/fwd.hpp>
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#include <boost/assign/v2/detail/keyword/nil.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/range/begin.hpp>
#include <boost/range/end.hpp>
@@ -36,8 +36,8 @@
template<typename T>
struct deque_impl{
- typedef /*<-*/std::deque<T>
- BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified /*<-*/)/*->*/
+ typedef /*<-*/std::deque<T>
+ BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified /*<-*/)/*->*/
type;
};
@@ -52,7 +52,7 @@
typedef typename deque_impl<T>::type impl_;
typedef impl_ const cimpl_;
typedef interpreter_crtp<
- impl_, F, ModifierTag, data_tag::value, deque_interpreter
+ impl_, F, ModifierTag, data_tag::value, deque_interpreter
> put_crtp_;
typedef interpreter_aux::interpreter_modifier<ModifierTag> modifier_;
@@ -139,15 +139,19 @@
struct replace_data_generator< deque_interpreter<T, F, ModifierTag> >
{
template<typename F1>
- struct apply{ typedef /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified/*<-*/)deque_interpreter<T, F1, ModifierTag>/*->*/ type; };
+ struct apply{
+ typedef /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified/*<-*/)deque_interpreter<T, F1, ModifierTag>/*->*/ type;
+ };
};
template<typename T, typename F, typename ModifierTag>
- struct replace_modifier_tag< deque_interpreter<T, F, ModifierTag> >/*<-*/
+ struct replace_modifier_tag< deque_interpreter<T, F, ModifierTag> >
{
template<typename ModifierTag1>
- struct apply{ /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified/*<-*/)typedef deque_interpreter<T, F, ModifierTag1>/*->*/ type; };
- }/*->*/;
+ struct apply{
+ /*<-*/BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified/*<-*/)typedef deque_interpreter<T, F, ModifierTag1>/*->*/ type;
+ };
+ };
//<-
namespace result_of{
@@ -163,11 +167,9 @@
};
}// result_of
-//<-
}// interpreter_aux
-//->
namespace interpreter_aux{
-//<-
+//->
template<typename T>
typename result_of::deque<T>::type
@@ -176,9 +178,7 @@
return typename result_of::deque<T>::type();
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-//<-
}// interpreter_aux
-//->
namespace result_of{
template<typename T>
@@ -189,8 +189,8 @@
}// result_of
//<-
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-namespace interpreter_aux{
//->
+namespace interpreter_aux{
template<typename T, typename...Args>
typename result_of::deque<T>::type
@@ -199,9 +199,9 @@
return deque<T>( v2::_nil )( std::forward<Args>(args)... );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-//]
}// interpreter_aux
using interpreter_aux::deque;
+//]
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
}// v2
Modified: sandbox/assign_v2/boost/assign/v2/detail/functor/value.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/functor/value.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/functor/value.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -10,7 +10,7 @@
#ifndef BOOST_ASSIGN_V2_DETAIL_FUNCTOR_VALUE_ER_2010_HPP
#define BOOST_ASSIGN_V2_DETAIL_FUNCTOR_VALUE_ER_2010_HPP
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#include <boost/assign/v2/detail/keyword/nil.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <utility>
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 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -9,8 +9,29 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_DETAIL_KEYWORD_ER_2010_HPP
#define BOOST_ASSIGN_V2_DETAIL_KEYWORD_ER_2010_HPP
-#include <boost/assign/v2/detail/keyword/key.hpp>
-#include <boost/assign/v2/detail/keyword/ignore.hpp>
-#include <boost/assign/v2/detail/keyword/nil.hpp>
+#include <boost/preprocessor/cat.hpp>
+
+namespace boost{
+namespace assign{
+namespace v2{
+namespace keyword_aux{
+
+ struct ignore{
+ ignore(){}
+ template<typename Anything> ignore(Anything){}
+ };
+
+ 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();
+}
+}// v2
+}// assign
+}// boost
#endif // BOOST_ASSIGN_V2_DETAIL_KEYWORD_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/keyword/ignore.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/keyword/ignore.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/keyword/ignore.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -1,32 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2010 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_DETAIL_KEYWORD_IGNORE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_DETAIL_KEYWORD_IGNORE_ER_2010_HPP
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace keyword_aux{
-
- struct ignore{
- ignore(){}
- template<typename Anything> ignore(Anything){}
- };
-
-
-}// keyword_aux
-namespace{
- const keyword_aux::ignore _ignore = keyword_aux::ignore();
-}
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_DETAIL_KEYWORD_IGNORE_ER_2010_HPP
+// TODO remove file
Modified: sandbox/assign_v2/boost/assign/v2/detail/keyword/key.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/keyword/key.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/keyword/key.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -1,30 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2010 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_DETAIL_KEYWORD_KEY_ER_2010_HPP
-#define BOOST_ASSIGN_V2_DETAIL_KEYWORD_KEY_ER_2010_HPP
-
-namespace boost{
-namespace assign{
-namespace v2{
-//[syntax_detail_keyword_key
-namespace keyword_aux{ struct key{}; }
-//<-
-namespace{
-//->
- const keyword_aux::key _key/*<-*/ = keyword_aux::key()/*->*/;
-//<-
-}
-//->
-//]
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_DETAIL_KEYWORD_KEY_ER_2010_HPP
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/keyword/nil.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -1,30 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2010 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_DETAIL_KEYWORD_NIL_ER_2010_HPP
-#define BOOST_ASSIGN_V2_DETAIL_KEYWORD_NIL_ER_2010_HPP
-
-namespace boost{
-namespace assign{
-namespace v2{
-//[syntax_detail_keyword_nil
-namespace keyword_aux{ struct nil{}; }
-//<-
-namespace{
-//->
- const keyword_aux::nil _nil/*<-*/ = keyword_aux::nil()/*->*/;
-//<-
-}
-//->
-//]
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_DETAIL_KEYWORD_NIL_ER_2010_HPP
+// TODO remove file
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 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -134,11 +134,11 @@
};
template<
- typename C // Container,
- , typename F // Data generator
+ typename C // Container,
+ , typename F // Data generator
, typename ModifierTag // Modifier tag
- , typename DataTag // Data tag
- , typename D // Derived
+ , typename DataTag // Data tag
+ , typename D // Derived
>
class interpreter_crtp
//<-
@@ -166,12 +166,12 @@
public:
typedef /*<-*/ typename modifier_holder_::modifier_type
- BOOST_ASSIGN_V2_IGNORE(/*->*/ interpreter_modifier<Tag> /*<-*/)/*->*/
+ BOOST_ASSIGN_V2_IGNORE(/*->*/ interpreter_modifier<Tag> /*<-*/)/*->*/
modifier_type;
interpreter_crtp(){}
explicit interpreter_crtp( F const& f )/*<-*/
- : data_gen_holder_( f )
+ : data_gen_holder_( f )
{}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
explicit interpreter_crtp( F const& f, modifier_type const& m )/*<-*/
: data_gen_holder_( f ), modifier_holder_( m )
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/data_generator.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/data_generator.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/data_generator.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -18,23 +18,22 @@
namespace v2{
//[syntax_interpreter_data
namespace interpreter_aux{
-//<-
template<
typename C // Value or pointer-container
- , typename T/*->*/ = typename v2::container_aux::value<C>::type/*->*/
- , bool is_map/*->*/ = v2::container_aux::is_map<C>::value/*->*/
+ , typename T/*<-*/ = typename v2::container_aux::value<C>::type/*->*/
+ , bool is_map/*<-*/ = v2::container_aux::is_map<C>::value/*->*/
>
struct deduce_data_generator/*<-*/
{
- typedef v2::functor_aux::value<T> type;
+ typedef v2::functor_aux::value<T> type;
}/*->*/;
template<typename C, typename T>
struct deduce_data_generator<C, T, true>/*<-*/
{
- typedef v2::functor_aux::pair<
- T,
+ typedef v2::functor_aux::pair<
+ T,
typename container_aux::key<C>::type,
typename container_aux::mapped<C>::type
> type;
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/fwd.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -11,34 +11,34 @@
#define BOOST_ASSIGN_V2_INTERPRETER_FWD_ER_2010_HPP
namespace boost{
- struct use_default;
+ struct use_default;
namespace assign{
namespace v2{
namespace data_tag{
- // Storage
+ // Storage
struct storage{};
struct storage_ptr : storage{};
struct storage_value : storage{};
- // Assign
- struct assign{};
+ // Assign
+ struct assign{};
struct assign_map : assign{};
- template<typename Storage, typename Assign> struct plus : Storage{};
+ template<typename Storage, typename Assign> struct plus : Storage{};
- // Shortcuts
+ // Shortcuts
- typedef plus<storage_ptr, assign> ptr;
- typedef plus<storage_ptr, assign_map> ptr_map;
- typedef plus<storage_value, assign> value;
+ typedef plus<storage_ptr, assign> ptr;
+ typedef plus<storage_ptr, assign_map> ptr_map;
+ typedef plus<storage_value, assign> value;
typedef plus<storage_value, assign_map> value_map;
}// data_tag
namespace interpreter_aux{
template<typename C, typename F,
- typename ModifierTag, typename DataTag, typename D>
+ typename ModifierTag, typename DataTag, typename D>
class interpreter_crtp;
template<typename Tag>
Modified: sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/modifier.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -121,25 +121,25 @@
//->
- template<
- typename C // Container
+ template<
+ typename C // Container
>
- struct deduce_data_tag{
+ struct deduce_data_tag/*<-*/{
- typedef typename ::boost::mpl::if_<
- container_aux::is_ptr_container<C>,
- data_tag::storage_ptr,
- data_tag::storage_value
- >::type storage_;
+ typedef typename ::boost::mpl::if_<
+ container_aux::is_ptr_container<C>,
+ data_tag::storage_ptr,
+ data_tag::storage_value
+ >::type storage_;
- typedef typename ::boost::mpl::if_<
- container_aux::is_map<C>,
- data_tag::assign_map,
- data_tag::assign
+ typedef typename ::boost::mpl::if_<
+ container_aux::is_map<C>,
+ data_tag::assign_map,
+ data_tag::assign
>::type assign_;
- typedef data_tag::plus<storage_, assign_> type;
- };
+ typedef data_tag::plus<storage_, assign_> type;
+ }/*->*/;
}// 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 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -10,8 +10,7 @@
#ifndef BOOST_ASSIGN_V2_OPTION_DATA_GENERATOR_ER_2010_HPP
#define BOOST_ASSIGN_V2_OPTION_DATA_GENERATOR_ER_2010_HPP
#include <boost/assign/v2/detail/functor/value.hpp>
-#include <boost/assign/v2/detail/keyword/key.hpp>
-#include <boost/assign/v2/detail/keyword/ignore.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/interpreter/data_generator.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
@@ -121,7 +120,7 @@
rhs.template data_generator<C>(),
lhs.modifier
);
- }/*<-*/BOOST_ASSIGN_V2_IGNORE(/*<-*/;/*->*/)/*->*/
+ }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
struct keyword_data_generator
/*<-*/{
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 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -9,7 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_OPTION_MODIFIER_FRAMEWORK_ER_2010_HPP
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_FRAMEWORK_ER_2010_HPP
-#include <boost/assign/v2/detail/keyword/ignore.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
#include <boost/assign/v2/interpreter/modifier.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/option/modifier/insert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier/insert.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier/insert.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -10,7 +10,7 @@
#ifndef BOOST_ASSIGN_V2_OPTION_MODIFIER_INSERT_ER_2010_HPP
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_INSERT_ER_2010_HPP
#include <cstddef>
-#include <boost/assign/v2/detail/keyword/ignore.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/traits/container.hpp>
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
@@ -35,7 +35,7 @@
}// modifier_tag
namespace interpreter_aux{
- template<>
+ template<>
class interpreter_modifier< modifier_tag::insert >/*<-*/
{
@@ -71,7 +71,7 @@
template<typename C, typename T>
void impl(C& cont, T& t, data_tag::ptr )const
{
- typedef typename container_aux::value<C>::type value_;
+ typedef typename container_aux::value<C>::type value_;
cont.insert( new value_( t ) );
}
@@ -80,7 +80,7 @@
{
typedef typename container_aux::key<C>::type key_;
key_ k = t.first; // non-const necessary. See ptr_map.
- typedef typename container_aux::mapped<C>::type m_;
+ typedef typename container_aux::mapped<C>::type m_;
cont.insert( k , new m_( t.second ) );
}
Modified: sandbox/assign_v2/boost/assign/v2/option/modifier/iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier/iterate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier/iterate.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -10,7 +10,7 @@
#ifndef BOOST_ASSIGN_V2_OPTION_MODIFIER_ITERATE_ER_2010_HPP
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_ITERATE_ER_2010_HPP
#include <cstddef>
-#include <boost/assign/v2/detail/keyword/ignore.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/detail/traits/container.hpp>
@@ -91,7 +91,7 @@
template<typename C, typename T>
void impl(C& cont, T& t, data_tag::ptr )const
{
- typedef typename container_aux::value<C>::type value_;
+ typedef typename container_aux::value<C>::type value_;
cont.replace( (*this->ptr)(), new value_( t ) );
}
Modified: sandbox/assign_v2/boost/assign/v2/option/modifier/mapped.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier/mapped.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier/mapped.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -9,7 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_OPTION_MODIFIER_MAPPED_ER_2010_HPP
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_MAPPED_ER_2010_HPP
-#include <boost/assign/v2/detail/keyword/ignore.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/detail/traits/container.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/option/modifier/std.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier/std.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier/std.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -9,7 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_OPTION_MODIFIER_STD_ER_2010_HPP
#define BOOST_ASSIGN_V2_OPTION_MODIFIER_STD_ER_2010_HPP
-#include <boost/assign/v2/detail/keyword/ignore.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/detail/traits/container.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
#include <boost/assign/v2/option/modifier/framework.hpp>
@@ -29,14 +29,14 @@
#define BOOST_ASSIGN_V2_OPTION_STD_MODIFIER_IMPL_CPP03(FUN)\
template<typename C, typename T>\
- void impl(C& cont, T& t, data_tag::value)const{\
- cont.FUN( t );\
- }\
+ void impl(C& cont, T& t, data_tag::value)const{\
+ cont.FUN( t );\
+ }\
template<typename C, typename T>\
void impl(C& cont, T& t, data_tag::ptr)const{\
typedef typename container_aux::value<C>::type value_;\
- cont.FUN( new value_( t ) );\
- }\
+ cont.FUN( new value_( t ) );\
+ }\
/**/
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -11,7 +11,7 @@
#define BOOST_ASSIGN_V2_REF_ARRAY_CSV_ARRAY_ER_2010_HPP
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
-#include <boost/assign/v2/detail/keyword/nil.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/ref/array/alloc/instant.hpp>
#include <boost/assign/v2/ref/array/size_type.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/ref/aux_/list/list.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/aux_/list/list.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/aux_/list/list.hpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -9,7 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_REF_AUX_LIST_LIST_ER_2010_HPP
#define BOOST_ASSIGN_V2_REF_AUX_LIST_LIST_ER_2010_HPP
-#include <boost/assign/v2/detail/keyword/nil.hpp>
+#include <boost/assign/v2/detail/keyword.hpp>
#include <boost/assign/v2/ref/aux_/list/container.hpp>
#include <boost/assign/v2/ref/aux_/list/fwd.hpp>
#include <boost/mpl/apply.hpp>
Modified: sandbox/assign_v2/libs/assign/v2/test/option/list.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/list.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/list.cpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -26,16 +26,16 @@
{
//xxx_csv_put::test();
//xxx_option::test();
- using namespace boost::assign::v2;
- std::deque<int> cont;
+ using namespace boost::assign::v2;
+ std::deque<int> cont;
- ( _list_option ).apply( put( cont ) )( 1 );
+ ( _list_option ).apply( put( cont ) )( 1 );
BOOST_ASSIGN_V2_CHECK( cont[0] == 1 );
using namespace boost::lambda;
- BOOST_AUTO(
- apply,
+ BOOST_AUTO(
+ apply,
(
- _list_option % _push_front % ( _data = ( _1 % 10 ) )
+ _list_option % _push_front % ( _data = ( _1 % 10 ) )
).apply( put( cont ) )
);
apply( 15 );
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 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -48,7 +48,7 @@
typedef as2::result_of::put<std::vector<int> >::type put_;
typedef as2::modifier_tag::push_front tag_;
typedef as2::result_of::option_std_modifier<
- put_, tag_
+ put_, tag_
>::type result1_;
typedef as2:: interpreter_aux::replace_modifier_tag<put_> meta2_;
typedef ::boost::mpl::apply1<meta2_, tag_>::type result2_;
Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/csv_put.cpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -50,16 +50,16 @@
cal | as2::_csv_put( T("jan", 31), T( "feb", 28 ), T("mar", 31) );
- BOOST_ASSIGN_V2_CHECK(
- range::equal(
- cal | as2::_csv_put( T("jan", 31), T("feb", 28 ), T("mar", 31) ),
+ BOOST_ASSIGN_V2_CHECK(
+ range::equal(
+ cal | as2::_csv_put( T("jan", 31), T("feb", 28 ), T("mar", 31) ),
benchmark
)
);
//]
}
{
- //[test_pipe_csv_put_map
+ //[test_pipe_csv_put_map_ptr
typedef boost::ptr_map<std::string, int> C;
typedef as2::value_container_value<C>::type T;
@@ -68,10 +68,10 @@
benchmark["feb"] = 28;
benchmark["mar"] = 31;
- C cal;
+ C cal;
BOOST_ASSIGN_V2_CHECK(
- range::equal(
- cal | as2::_csv_put( T("jan", 31), T("feb", 28 ), T("mar", 31) ),
+ range::equal(
+ cal | as2::_csv_put( T("jan", 31), T("feb", 28 ), T("mar", 31) ),
benchmark
)
);
Modified: sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/pipe/option/mapped.cpp 2011-03-29 20:01:28 EDT (Tue, 29 Mar 2011)
@@ -50,10 +50,10 @@
C cal; as2::put( cal )("feb", 28);
using namespace lambda;
BOOST_ASSIGN_V2_CHECK(
- range::equal(
- cal
- | ( apply % ( as2::_mapped = (_1 = 30) ) )( "apr", "jun", "sep", "nov" )
- | ( apply % ( as2::_mapped = (_1 = 31) ) )( "jan", "mar", "may", "jul", "aug", "oct", "dec" ),
+ range::equal(
+ cal
+ | ( apply % ( as2::_mapped = (_1 = 30) ) )( "apr", "jun", "sep", "nov" )
+ | ( apply % ( as2::_mapped = (_1 = 31) ) )( "jan", "mar", "may", "jul", "aug", "oct", "dec" ),
benchmark
)
);
@@ -80,10 +80,10 @@
BOOST_AUTO( apply, as2::_csv_put % (as2::_data = as2::_key) );
using namespace lambda;
BOOST_ASSIGN_V2_CHECK(
- range::equal(
- cal
- | ( apply % ( as2::_mapped = (_1 = 30) ) )( "apr", "jun", "sep", "nov" )
- | ( apply % ( as2::_mapped = (_1 = 31) ) )( "jan", "mar", "may", "jul", "aug", "oct", "dec" ),
+ range::equal(
+ cal
+ | ( apply % ( as2::_mapped = (_1 = 30) ) )( "apr", "jun", "sep", "nov" )
+ | ( apply % ( as2::_mapped = (_1 = 31) ) )( "jan", "mar", "may", "jul", "aug", "oct", "dec" ),
benchmark
)
);
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