Subject: [Boost-commit] svn:boost r70324 - in sandbox/assign_v2/boost/assign/v2: deque framework optional optional/standard put
From: erwann.rogard_at_[hidden]
Date: 2011-03-21 13:54:22
Author: e_r
Date: 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
New Revision: 70324
URL: http://svn.boost.org/trac/boost/changeset/70324
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/deque/deque.hpp | 1
sandbox/assign_v2/boost/assign/v2/framework/fwd.hpp | 2
sandbox/assign_v2/boost/assign/v2/framework/modifier.hpp | 103 ++++++++++++++++++++++++++++++++
sandbox/assign_v2/boost/assign/v2/optional/deduce.hpp | 124 ---------------------------------------
sandbox/assign_v2/boost/assign/v2/optional/iterate.hpp | 3
sandbox/assign_v2/boost/assign/v2/optional/lookup.hpp | 3
sandbox/assign_v2/boost/assign/v2/optional/repeat.hpp | 3
sandbox/assign_v2/boost/assign/v2/optional/standard/modifier.hpp | 5
sandbox/assign_v2/boost/assign/v2/put/put.hpp | 1
9 files changed, 114 insertions(+), 131 deletions(-)
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-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -18,7 +18,6 @@
#include <boost/assign/v2/detail/keyword/nil.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/fun/deduce.hpp>
-#include <boost/assign/v2/optional/deduce.hpp>
#include <boost/range/begin.hpp>
#include <boost/range/end.hpp>
#include <boost/range/iterator.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/framework/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/framework/fwd.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/framework/fwd.hpp 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -18,6 +18,8 @@
template<typename C, typename F, typename Tag, typename D>
class adapter_crtp;
+ template<typename Tag> struct /*<<Specialize on Tag>>*/ adapter_modifier;
+
}// aux
}// v2
}// assign
Modified: sandbox/assign_v2/boost/assign/v2/framework/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/framework/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/framework/modifier.hpp 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -10,7 +10,18 @@
#ifndef BOOST_ASSIGN_V2_FRAMEWORK_MODIFIER_ER_2010_HPP
#define BOOST_ASSIGN_V2_FRAMEWORK_MODIFIER_ER_2010_HPP
#include <boost/assign/v2/detail/pp/ignore.hpp>
+#include <boost/assign/v2/detail/traits/value_container/has_push.hpp>
+#include <boost/assign/v2/detail/traits/value_container/category.hpp>
+#include <boost/assign/v2/detail/traits/ptr_container/meta.hpp>
+#include <boost/assign/v2/detail/traits/switch.hpp>
+#include <boost/assign/v2/optional/insert.hpp>
+#include <boost/assign/v2/optional/iterate.hpp>
+#include <boost/assign/v2/optional/push.hpp>
+#include <boost/assign/v2/optional/push_back.hpp>
#include <boost/concept_check.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/type_traits/is_same.hpp>
namespace boost{
namespace assign{
@@ -22,7 +33,7 @@
template<typename Tag>
struct /*<<Specialize on Tag>>*/ adapter_modifier{};
-}
+}// aux
namespace put_concept{
template<typename Tag, /*<<Container>>*/ typename C, /*<<Input>>*/ typename T>
@@ -42,6 +53,96 @@
}
//]
+namespace switch_tag{
+ struct deduce_put{};
+}// switch_tag
+
+#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE
+#error
+#else
+#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE(Tag, MetaF, Number)\
+namespace switch_aux{\
+ template<>\
+ struct case_<switch_tag::deduce_put, Number> :\
+ switch_aux::helper<\
+ v2::modifier_tag::Tag,\
+ ptr_container_aux::through_value_container<MetaF>::apply\
+ >{};\
+}\
+/**/
+#endif
+
+
+#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ASSOCIATIVE
+#error
+#else
+#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ASSOCIATIVE(CaseNumber)\
+BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE(insert, value_container_aux::is_sorted, CaseNumber)\
+/**/
+#endif
+
+#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ARRAY
+#error
+#else
+#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ARRAY(CaseNumber)\
+BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE(iterate<>, value_container_aux::is_array, CaseNumber)
+/**/
+#endif
+
+#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ADAPTER
+#error
+#else
+#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ADAPTER(CaseNumber)\
+BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE(push, value_container_aux::has_push_deduced_value, CaseNumber)
+/**/
+#endif
+
+#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_DEFAULT
+#error
+#else
+#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_DEFAULT(CaseNumber)\
+namespace switch_aux{\
+ template<>\
+ struct case_<switch_tag::deduce_put, CaseNumber> :\
+ switch_aux::helper<v2::modifier_tag::push_back>\
+ {};\
+}\
+/**/
+#endif
+
+//[example_put_modifier_deduce_switch
+#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH
+#warning
+#else
+BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ASSOCIATIVE(0)
+BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ARRAY(1)
+BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ADAPTER(2)
+BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_DEFAULT(3)
+#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH
+//]
+#endif
+
+//[syntax_put_modifier_deduce
+namespace aux{
+
+ template<typename C>
+ struct /*<<Meta-function returning a modifier-tag>>*/deduce_modifier_tag/*<-*/
+ : switch_aux::result< switch_tag::deduce_put, C>
+ {}/*->*/;
+
+}// aux
+//]
+namespace aux{
+
+ // For testing purposes
+ template<typename C, typename X>
+ void check_deduce()
+ {
+ typedef typename aux::deduce_modifier_tag<C>::type found_;
+ BOOST_MPL_ASSERT(( boost::is_same<found_, X> ));
+ }
+
+}// aux
}// v2
}// assign
}// boost
Modified: sandbox/assign_v2/boost/assign/v2/optional/deduce.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/deduce.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/deduce.hpp 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -1,123 +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_OPTIONAL_DEDUCE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_ER_2010_HPP
-#include <boost/assign/v2/detail/pp/ignore.hpp>
-#include <boost/assign/v2/detail/traits/value_container/has_push.hpp>
-#include <boost/assign/v2/detail/traits/value_container/category.hpp>
-#include <boost/assign/v2/detail/traits/ptr_container/meta.hpp>
-#include <boost/assign/v2/detail/traits/switch.hpp>
-#include <boost/assign/v2/optional/insert.hpp>
-#include <boost/assign/v2/optional/iterate.hpp>
-#include <boost/assign/v2/optional/push.hpp>
-#include <boost/assign/v2/optional/push_back.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace switch_tag{
- struct deduce_put{};
-}// switch_tag
-
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE
-#error
-#else
-#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE(Tag, MetaF, Number)\
-namespace switch_aux{\
- template<>\
- struct case_<switch_tag::deduce_put, Number> :\
- switch_aux::helper<\
- v2::modifier_tag::Tag,\
- ptr_container_aux::through_value_container<MetaF>::apply\
- >{};\
-}\
-/**/
-#endif
-
-
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ASSOCIATIVE
-#error
-#else
-#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ASSOCIATIVE(CaseNumber)\
-BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE(insert, value_container_aux::is_sorted, CaseNumber)\
-/**/
-#endif
-
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ARRAY
-#error
-#else
-#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ARRAY(CaseNumber)\
-BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE(iterate<>, value_container_aux::is_array, CaseNumber)
-/**/
-#endif
-
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ADAPTER
-#error
-#else
-#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ADAPTER(CaseNumber)\
-BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_CASE(push, value_container_aux::has_push_deduced_value, CaseNumber)
-/**/
-#endif
-
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_DEFAULT
-#error
-#else
-#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_DEFAULT(CaseNumber)\
-namespace switch_aux{\
- template<>\
- struct case_<switch_tag::deduce_put, CaseNumber> :\
- switch_aux::helper<v2::modifier_tag::push_back>\
- {};\
-}\
-/**/
-#endif
-
-//[example_put_modifier_deduce_switch
-#ifdef BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH
-#warning
-#else
-BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ASSOCIATIVE(0)
-BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ARRAY(1)
-BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_ADAPTER(2)
-BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH_DEFAULT(3)
-#define BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_SWITCH
-//]
-#endif
-
-//[syntax_put_modifier_deduce
-namespace aux{
-
- template<typename C>
- struct /*<<Meta-function returning a modifier-tag>>*/deduce_modifier_tag/*<-*/
- : switch_aux::result< switch_tag::deduce_put, C>
- {}/*->*/;
-
-}// aux
-//]
-
-namespace aux{
-
- // For testing purposes
- template<typename C, typename X>
- void check_deduce()
- {
- typedef typename aux::deduce_modifier_tag<C>::type found_;
- BOOST_MPL_ASSERT(( boost::is_same<found_, X> ));
- }
-
-}// aux
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_OPTIONAL_DEDUCE_ER_2010_HPP
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/optional/iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/iterate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/iterate.hpp 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -13,7 +13,8 @@
#include <boost/assign/v2/detail/keyword/ignore.hpp>
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
-#include <boost/assign/v2/framework/modifier.hpp>
+//#include <boost/assign/v2/framework/modifier.hpp>
+#include <boost/assign/v2/framework/fwd.hpp>
#include <boost/call_traits.hpp>
#include <boost/shared_ptr.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
Modified: sandbox/assign_v2/boost/assign/v2/optional/lookup.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/lookup.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/lookup.hpp 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -11,7 +11,8 @@
#define BOOST_ASSIGN_V2_OPTIONAL_LOOKUP_ER_2010_HPP
#include <boost/assign/v2/detail/keyword/ignore.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
-#include <boost/assign/v2/framework/modifier.hpp>
+//#include <boost/assign/v2/framework/modifier.hpp>
+#include <boost/assign/v2/framework/fwd.hpp>
#include <boost/call_traits.hpp>
#include <boost/shared_ptr.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/optional/repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/repeat.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/repeat.hpp 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -17,7 +17,8 @@
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/is_reference.hpp>
#endif
-#include <boost/assign/v2/framework/modifier.hpp>
+//#include <boost/assign/v2/framework/modifier.hpp>
+#include <boost/assign/v2/framework/fwd.hpp>
namespace boost{
namespace assign{
Modified: sandbox/assign_v2/boost/assign/v2/optional/standard/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/optional/standard/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/optional/standard/modifier.hpp 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -10,8 +10,9 @@
#ifndef BOOST_ASSIGN_V2_OPTIONAL_STANDARD_MODIFIER_ER_2010_HPP
#define BOOST_ASSIGN_V2_OPTIONAL_STANDARD_MODIFIER_ER_2010_HPP
#include <boost/assign/v2/detail/keyword/ignore.hpp>
-#include <boost/assign/v2/framework/modifier.hpp>
-#include <boost/assign/v2/optional/modulo.hpp>
+//#include <boost/assign/v2/framework/modifier.hpp>
+#include <boost/assign/v2/framework/fwd.hpp>
+#include <boost/assign/v2/optional/modifier.hpp>
#include <boost/preprocessor/cat.hpp>
#define BOOST_ASSIGN_V2_OPTIONAL_MODIFIER_STANDARD_IMPL_PTR(FUN)\
Modified: sandbox/assign_v2/boost/assign/v2/put/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/put.hpp 2011-03-21 13:54:20 EDT (Mon, 21 Mar 2011)
@@ -14,7 +14,6 @@
#include <boost/assign/v2/framework/replace_parameter.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/fun/deduce.hpp>
-#include <boost/assign/v2/optional/deduce.hpp>
#include <boost/assign/v2/ref/wrapper/copy.hpp>
namespace boost{