|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69921 - in sandbox/assign_v2: boost/assign/v2/put boost/assign/v2/put/container boost/assign/v2/put/deque boost/assign/v2/put/pipe boost/assign/v2/utility/conversion libs/assign/v2/test/put libs/assign/v2/test/put/modifier libs/assign/v2/test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-13 09:30:04
Author: e_r
Date: 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
New Revision: 69921
URL: http://svn.boost.org/trac/boost/changeset/69921
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/put/container.hpp | 3 -
sandbox/assign_v2/boost/assign/v2/put/container/adapter.hpp | 76 ---------------------------------------
sandbox/assign_v2/boost/assign/v2/put/container/fwd.hpp | 26 -------------
sandbox/assign_v2/boost/assign/v2/put/container/put.hpp | 48 ------------------------
sandbox/assign_v2/boost/assign/v2/put/deque/deque.hpp | 1
sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/pipe/put.hpp | 2
sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/container.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/fun.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/modifier/iterate.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/modifier/lookup.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/modifier/repeat.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/modifier/standard.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp | 2
16 files changed, 15 insertions(+), 161 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/put/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/container.hpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -10,7 +10,6 @@
#ifndef BOOST_ASSIGN_V2_PUT_CONTAINER_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_CONTAINER_ER_2010_HPP
#include <boost/assign/v2/put/container/adapter.hpp>
-#include <boost/assign/v2/put/container/fwd.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#endif // BOOST_ASSIGN_V2_PUT_CONTAINER_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/put/container/adapter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/adapter.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/adapter.hpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -1,75 +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_PUT_CONTAINER_ADAPTER_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_CONTAINER_ADAPTER_ER_2010_HPP
-#include <boost/assign/v2/ref/wrapper/copy.hpp>
-#include <boost/assign/v2/put/container/fwd.hpp> // consistency
-#include <boost/assign/v2/put/adapter/crtp.hpp>
-#include <boost/assign/v2/put/adapter/modifier.hpp>
-#include <boost/assign/v2/put/adapter/replace_parameter.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace put_aux{
-
- template<typename C, typename F, typename Tag>
- class container_adapter
- : protected ref::wrapper< ref::assign_tag::copy, C >
- , public put_aux::crtp< C, F, Tag, container_adapter<C, F, Tag> >
- {
- typedef put_aux::crtp< C, F, Tag, container_adapter > super2_t;
-
- public:
-
- typedef typename super2_t::result_type result_type;
-
- protected:
-
- typedef put_aux::adapter_modifier<Tag> modifier_;
- typedef ref::assign_tag::copy assign_tag_;
- typedef ref::wrapper<assign_tag_,C> super1_t;
-
- public:
-
- container_adapter(){}
- explicit container_adapter( C& cont ) : super1_t( cont ) {}
- explicit container_adapter( C& cont, F const& f, modifier_ const& m )
- : super1_t( cont ), super2_t( f, m )
- {
- // This constructor is required in conjunction with modulo
- }
-
- C& container()const{
- return static_cast<super1_t const&>(*this).get();
- }
-
- };
-
- template<typename C, typename F, typename Tag>
- struct replace_fun< put_aux::container_adapter<C, F, Tag> >
- {
- template<typename F1>
- struct apply{ typedef put_aux::container_adapter<C, F1, Tag> type; };
- };
-
- template<typename C, typename F, typename Tag>
- struct replace_modifier_tag< put_aux::container_adapter<C, F, Tag> >
- {
- template<typename Tag1>
- struct apply{ typedef put_aux::container_adapter<C, F, Tag1> type; };
- };
-
-}// put_aux
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_PUT_CONTAINER_ADAPTER_ER_2010_HPP
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/put/container/fwd.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/fwd.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/fwd.hpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -1,25 +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_PUT_CONTAINER_FWD_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_CONTAINER_FWD_ER_2010_HPP
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace put_aux{
-
- template<typename C, typename F, typename Tag> class container_adapter;
-
-}// put_aux
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_PUT_CONTAINER_FWD_ER_2010_HPP
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/put/container/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/container/put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/container/put.hpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -1,47 +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_PUT_CONTAINER_PUT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_PUT_CONTAINER_PUT_ER_2010_HPP
-#include <boost/assign/v2/put/container/fwd.hpp>
-#include <boost/assign/v2/put/container/adapter.hpp>
-#include <boost/assign/v2/put/fun/deduce.hpp>
-#include <boost/assign/v2/put/modifier/deduce.hpp>
-#include <boost/assign/v2/put/modifier/deduce/dependee.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-//synopsis_put_container
-namespace result_of{
-
- template<typename C>
- struct put
- {
- typedef typename put_aux::deduce_fun<C>::type f_;
- typedef typename put_aux::deduce_modifier_tag<C>::type modifier_tag_;
- typedef put_aux::container_adapter<C, f_, modifier_tag_> type;
- };
-
-}// result_of
-
- template<typename C>
- typename result_of::put<C>::type
- put( C& cont )
- {
- typedef typename result_of::put<C>::type result_;
- return result_( cont );
- }
-
-//]
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_PUT_CONTAINER_FUNCTOR_RESULT_OF_ER_2010_HPP
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/put/deque/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/deque/deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/deque/deque.hpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -13,7 +13,6 @@
#include <boost/assign/v2/detail/keyword/nil.hpp>
#include <boost/assign/v2/put/fun/deduce.hpp>
#include <boost/assign/v2/put/modifier/deduce.hpp>
-#include <boost/assign/v2/put/modifier/deduce/dependee.hpp>
//#include <boost/assign/v2/put/deque/fwd.hpp>
#include <boost/assign/v2/put/deque/adapter.hpp>
#include <boost/type_traits/remove_cv.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/csv_put.hpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -11,7 +11,7 @@
#define BOOST_ASSIGN_V2_PUT_PIPE_CSV_PUT_ER_2010_HPP
#include <boost/assign/v2/ref/array/as_arg_list.hpp>
#include <boost/assign/v2/ref/list/as_modulo_list.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/pipe/arg_list.hpp>
namespace boost{
Modified: sandbox/assign_v2/boost/assign/v2/put/pipe/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/pipe/put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/pipe/put.hpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -11,7 +11,7 @@
#define BOOST_ASSIGN_V2_PUT_PIPE_PUT_ER_2010_HPP
#include <boost/assign/v2/ref/list/as_modulo_list.hpp>
#include <boost/assign/v2/ref/list_tuple/as_args_list.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/pipe/args_list.hpp>
namespace boost{
Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -9,7 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_ER_2010_HPP
#define BOOST_ASSIGN_V2_UTILITY_CONVERSION_CONVERT_ER_2010_HPP
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/utility/conversion/deduce_tag.hpp>
#include <boost/range/algorithm/for_each.hpp>
Modified: sandbox/assign_v2/libs/assign/v2/test/put/container.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/container.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/container.cpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -19,7 +19,7 @@
#include <string>
#include <utility>
#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/deque/csv_deque.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/range/algorithm_ext/iota.hpp>
Modified: sandbox/assign_v2/libs/assign/v2/test/put/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/fun.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/fun.cpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -13,7 +13,7 @@
#include <vector>
#include <boost/array.hpp>
#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/deque.hpp>
#include <boost/assign/v2/put/fun.hpp>
#include <boost/function.hpp>
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier/iterate.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier/iterate.cpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -18,7 +18,7 @@
#include <boost/assign/v2/detail/config/check.hpp>
#include <boost/assign/v2/put/modifier/iterate.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/deque.hpp>
#include <libs/assign/v2/test/put/modifier/iterate.h>
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier/lookup.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier/lookup.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier/lookup.cpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -20,7 +20,7 @@
#include <boost/assign/v2/detail/config/check.hpp>
#include <boost/assign/v2/put/fun.hpp>
#include <boost/assign/v2/put/modifier/lookup.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/deque.hpp>
#include <libs/assign/v2/test/put/modifier/lookup.h>
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier/repeat.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier/repeat.cpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -12,7 +12,7 @@
#include <boost/assign/v2/detail/config/check.hpp>
#include <boost/assign/v2/put/modifier/push_front.hpp>
#include <boost/assign/v2/put/modifier/repeat.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/deque.hpp>
#include <libs/assign/v2/test/put/modifier/repeat.h>
Modified: sandbox/assign_v2/libs/assign/v2/test/put/modifier/standard.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/modifier/standard.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/modifier/standard.cpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -14,7 +14,7 @@
#include <string>
#include <boost/assign/v2/detail/config/check.hpp>
#include <boost/assign/v2/put/modifier/standard.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/deque.hpp>
#include <boost/range/begin.hpp>
#include <boost/range/end.hpp>
Modified: sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/ptr.cpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -16,7 +16,7 @@
#include <boost/ptr_container/ptr_set.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
*/
#include <libs/assign/v2/test/put/ptr.h>
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/csv.cpp 2011-03-13 09:29:59 EDT (Sun, 13 Mar 2011)
@@ -11,7 +11,7 @@
#include <boost/assign/v2/detail/config/check.hpp>
#include <boost/assign/v2/utility/csv.hpp>
#include <boost/assign/v2/put/deque.hpp>
-#include <boost/assign/v2/put/container/put.hpp>
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/put/modifier/push_front.hpp>
#include <libs/assign/v2/test/utility/csv.h>
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