Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r70345 - in sandbox/assign_v2: boost/assign boost/assign/v2 boost/assign/v2/deque boost/assign/v2/fun boost/assign/v2/include boost/assign/v2/put libs/assign/v2/src libs/assign/v2/test/optional libs/assign/v2/test/put/pipe/optional
From: erwann.rogard_at_[hidden]
Date: 2011-03-21 15:29:26

Author: e_r
Date: 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
New Revision: 70345
URL: http://svn.boost.org/trac/boost/changeset/70345

Log:
upd assign_v2
Text files modified:
   sandbox/assign_v2/boost/assign/v2.hpp | 1
   sandbox/assign_v2/boost/assign/v2/deque/deque.hpp | 2
   sandbox/assign_v2/boost/assign/v2/fun.hpp | 16 ----
   sandbox/assign_v2/boost/assign/v2/fun/deduce.hpp | 63 ------------------
   sandbox/assign_v2/boost/assign/v2/fun/modulo.hpp | 135 ---------------------------------------
   sandbox/assign_v2/boost/assign/v2/include.hpp | 3
   sandbox/assign_v2/boost/assign/v2/include/fun.hpp | 14 ----
   sandbox/assign_v2/boost/assign/v2/include/modifier.hpp | 14 ----
   sandbox/assign_v2/boost/assign/v2/put/put.hpp | 2
   sandbox/assign_v2/libs/assign/v2/src/main.cpp | 10 +-
   sandbox/assign_v2/libs/assign/v2/test/optional/fun.cpp | 2
   sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp | 8 +-
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.cpp | 3
   sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp | 2
   14 files changed, 20 insertions(+), 255 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2.hpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -12,7 +12,6 @@

#include <boost/assign/v2/detail.hpp>
#include <boost/assign/v2/deque.hpp>
-#include <boost/assign/v2/fun.hpp>
#include <boost/assign/v2/optional.hpp>
#include <boost/assign/v2/put.hpp>
#include <boost/assign/v2/ref.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-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -11,13 +11,13 @@
#define BOOST_ASSIGN_V2_DEQUE_DEQUE_ER_2010_HPP
#include <deque>
#include <boost/assign/v2/framework/adapter_crtp.hpp>
+#include <boost/assign/v2/framework/fun.hpp>
#include <boost/assign/v2/framework/modifier.hpp>
#include <boost/assign/v2/framework/replace_parameter.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/pp/ignore.hpp>
-#include <boost/assign/v2/fun/deduce.hpp>
#include <boost/range/begin.hpp>
#include <boost/range/end.hpp>
#include <boost/range/iterator.hpp>

Modified: sandbox/assign_v2/boost/assign/v2/fun.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/fun.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/fun.hpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -1,15 +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_FUN_ER_2010_HPP
-#define BOOST_ASSIGN_V2_FUN_ER_2010_HPP
-#include <boost/assign/v2/fun/deduce.hpp>
-#include <boost/assign/v2/fun/modulo.hpp>
-
-#endif // BOOST_ASSIGN_V2_FUN_ER_2010_HPP
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/fun/deduce.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/fun/deduce.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/fun/deduce.hpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -1,62 +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_FUN_DEDUCE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_FUN_DEDUCE_ER_2010_HPP
-#include <boost/assign/v2/detail/traits/ptr_container/to_value_container.hpp>
-#include <boost/assign/v2/detail/traits/ptr_container/meta.hpp>
-#include <boost/assign/v2/detail/functor/constructor.hpp>
-#include <boost/assign/v2/detail/functor/new.hpp>
-#include <boost/mpl/eval_if.hpp>
-
-#include <boost/type_traits/remove_pointer.hpp>
-#include <boost/type_traits/is_pointer.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-//[syntax_put_fun_deduce
-namespace aux{
-
- template<typename C>
- struct container_value{ typedef typename C::value_type type; };
-
- template<typename /*<<Pointer-container>>*/PtrC>
- struct /*<<Meta-function mapping the `PtrC`'s pointer-type to a factory thereof>>*/ deduce_fun_pointer/*<-*/
- {
- typedef typename v2::ptr_container_aux::to_value_container<
- PtrC
- >::type cont_;
- typedef functor_aux::new_<typename cont_::value_type> type;
- }/*->*/;
-
- template<typename /*<<Value-container>>*/C>
- struct /*<<Meta-function mapping `C`'s value-type to a factory thereof>>*/ deduce_fun_value/*<-*/
- {
-// typedef typename v2::container_traits::value<C>::type value_type;
- typedef functor_aux::constructor<typename C::value_type> type;
- }/*->*/;
-
- template<typename /*<<Either of a value or pointer-container>>*/C>
- struct /*<<Meta-function mapping `C`s element-type to a factory thereof>>*/deduce_fun/*<-*/
- : boost::mpl::eval_if<
- ptr_container_aux::is_ptr_container<C>,
- deduce_fun_pointer<C>,
- deduce_fun_value<C>
- >
- {}/*->*/;
-
-
-}// aux
-//]
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_FUN_DEDUCE_ER_2010_HPP
+// TODO remove file

Modified: sandbox/assign_v2/boost/assign/v2/fun/modulo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/fun/modulo.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/fun/modulo.hpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -1,134 +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_FUN_MODULO_ER_2010_HPP
-#define BOOST_ASSIGN_V2_FUN_MODULO_ER_2010_HPP
-#include <boost/assign/v2/detail/pp/ignore.hpp>
-#include <boost/assign/v2/detail/keyword/ignore.hpp>
-#include <boost/assign/v2/framework/fwd.hpp>
-#include <boost/assign/v2/framework/replace_parameter.hpp>
-#include <boost/mpl/apply.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-namespace aux{
-namespace result_of{
-
- template<typename D>
- struct modulo_fun{
-
- typedef aux::replace_fun<D> meta_;
-
- template<typename F>
- struct apply : ::boost::mpl::apply1<meta_, F>{};
-
- };
-
-}// result_of
-
- template<typename F = keyword_aux::ignore>
- struct modulo_fun
- {
- modulo_fun(){}
- modulo_fun(F f) : f_( f ){}
-
- F const& fun()const{ return this->f_; }
-
- private:
- F f_;
- };
-
- template<typename C, typename F, typename Tag, typename D, typename F1>
- typename ::boost::mpl::apply1<result_of::modulo_fun<D>, F1>::type
- operator%(
- adapter_crtp<C, F, Tag, D> const& lhs,
- modulo_fun<F1> const& rhs
- )
- {
- typedef result_of::modulo_fun<D> meta_;
- typedef typename ::boost::mpl::apply1<meta_, F1>::type result_;
- return result_( lhs.container(), rhs.fun(), lhs.modifier );
- }
-
- struct keyword_fun{
-
- template<typename F>
- modulo_fun<F> operator=(F const& f)const{
- return modulo_fun<F>( f );
- }
-
- };
-
-}// aux
-namespace{
- const aux::keyword_fun _fun = aux::keyword_fun();
-}
-//[syntax_put_fun_modulo
-namespace result_of{
-
- template<typename D>
- struct modulo_fun/*<-*/
- : aux::result_of::modulo_fun<D>
- {}/*->*/;
-
-}// result_of
-//]
-
-
-}// v2
-}// assign
-}// boost
-
-#include <boost/preprocessor/cat.hpp>
-
-#define BOOST_ASSIGN_V2_MODULO_FUN_GENERATE(NAME, FUN)\
-namespace boost{\
-namespace assign{\
-namespace v2{\
-namespace aux{\
-\
- template<typename T>\
- modulo_fun< FUN > NAME()\
- {\
- return ( v2::_fun = FUN() );\
- }\
-\
-}\
-using aux::NAME;\
-}\
-}\
-}\
-/**/
-
-#include <boost/assign/v2/detail/functor/constructor.hpp>
-BOOST_ASSIGN_V2_MODULO_FUN_GENERATE(constructor, v2::functor_aux::constructor<T>)
-
-#include <boost/assign/v2/detail/functor/new.hpp>
-BOOST_ASSIGN_V2_MODULO_FUN_GENERATE(new_ptr, v2::functor_aux::new_<T>)
-
-#include <boost/typeof/typeof.hpp>
-#include <boost/type_traits/add_const.hpp>
-#define BOOST_ASSIGN_V2_MODULO_FUN_KEYWORD(NAME, EXPR)\
-namespace boost{\
-namespace assign{\
-namespace v2{\
- typedef BOOST_TYPEOF( ( _fun = EXPR ) ) BOOST_PP_CAT(type_of,NAME);\
-namespace{\
-\
- boost::add_const<BOOST_PP_CAT(type_of,NAME)>::type BOOST_PP_CAT(_,NAME) = ( _fun = EXPR );\
-}\
-}\
-}\
-}\
-
-#include <boost/lambda/lambda.hpp>
-BOOST_ASSIGN_V2_MODULO_FUN_KEYWORD(identity, ::boost::lambda::_1)
-
-#endif // BOOST_ASSIGN_V2_FUN_MODULO_ER_2010_HPP
+// TODO remove file
\ No newline at end of file

Modified: sandbox/assign_v2/boost/assign/v2/include.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include.hpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -15,9 +15,8 @@
#include <boost/assign/v2/include/csv.hpp>
#include <boost/assign/v2/include/csv_deque.hpp>
#include <boost/assign/v2/include/deque.hpp>
-#include <boost/assign/v2/include/fun.hpp>
-#include <boost/assign/v2/include/modifier.hpp>
#include <boost/assign/v2/include/operator.hpp>
+#include <boost/assign/v2/include/optional.hpp>
#include <boost/assign/v2/include/ref.hpp>

#endif // BOOST_ASSIGN_V2_INCLUDE_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/fun.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/fun.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/fun.hpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -1,14 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// 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_INCLUDE_PUT_FUN_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_PUT_FUN_ER_2010_HPP
-#include <boost/assign/v2/fun.hpp>
-
-#endif // BOOST_ASSIGN_V2_INCLUDE_FUN_ER_2010_HPP

Modified: sandbox/assign_v2/boost/assign/v2/include/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/modifier.hpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -1,14 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// 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_INCLUDE_MODIFIER_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_MODIFIER_ER_2010_HPP
-#include <boost/assign/v2/optional.hpp>
-
-#endif // BOOST_ASSIGN_V2_INCLUDE_PIPE_ER_2010_HPP

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 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -10,10 +10,10 @@
#ifndef BOOST_ASSIGN_V2_PUT_PUT_ER_2010_HPP
#define BOOST_ASSIGN_V2_PUT_PUT_ER_2010_HPP
#include <boost/assign/v2/framework/adapter_crtp.hpp>
+#include <boost/assign/v2/framework/fun.hpp>
#include <boost/assign/v2/framework/modifier.hpp>
#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/ref/wrapper/copy.hpp>

namespace boost{

Modified: sandbox/assign_v2/libs/assign/v2/src/main.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/src/main.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/src/main.cpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -8,13 +8,14 @@
// Test
#include <libs/assign/v2/test/detail.h>
#include <libs/assign/v2/test/deque.h>
+#include <libs/assign/v2/test/framework.h>
#include <libs/assign/v2/test/optional.h>
#include <libs/assign/v2/test/put.h>
#include <libs/assign/v2/test/ref.h>
#include <libs/assign/v2/test/utility.h>

// Tutorial
-#include <libs/assign/v2/tutorial.h>
+//#include <libs/assign/v2/tutorial.h>

// Speed -- CPP0x required
//#include <fstream>
@@ -62,14 +63,15 @@
         using namespace test_assign_v2;
         xxx_detail::test();
         xxx_deque::test();
+ xxx_framework::test();
         xxx_optional::test();
         xxx_put::test();
         xxx_ref::test();
         xxx_utility::test();
     }
- {
- tutorial_assign_v2::run();
- }
+// {
+// tutorial_assign_v2::run();
+// }
     {
         //using namespace speed_assign_v2;
         //std::ofstream ofs("assign_v2_speed_test");

Modified: sandbox/assign_v2/libs/assign/v2/test/optional/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/fun.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/fun.cpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -16,7 +16,7 @@
#include <boost/assign/v2/deque.hpp>
#include <boost/assign/v2/put/put.hpp>
// Options come next
-#include <boost/assign/v2/fun.hpp>
+#include <boost/assign/v2/optional/fun.hpp>
#include <boost/function.hpp>
#include <boost/lambda/bind.hpp>
#include <boost/lambda/lambda.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/optional/lookup.cpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -1,4 +1,4 @@
-test_optional_//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
// Boost.Assign v2 //
// //
// Copyright (C) 2003-2004 Thorsten Ottosen //
@@ -11,12 +11,11 @@
#include <string>
#include <cmath>
#include <boost/assign/v2/detail/config/check.hpp>
-
-#include <boost/assign/v2/fun.hpp>
#include <boost/assign/v2/put/put.hpp>
+#include <boost/assign/v2/deque.hpp>
// Options come next
+#include <boost/assign/v2/optional/fun.hpp>
#include <boost/assign/v2/optional/lookup.hpp>
-#include <boost/assign/v2/deque.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/apply.hpp>
@@ -31,6 +30,7 @@

     void test()
     {
+
         using namespace boost;
         namespace as2 = assign::v2;
         {

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/fun.cpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -12,8 +12,9 @@
#include <vector>
#include <boost/assign/v2/detail/config/check.hpp>
#include <boost/assign/v2/deque/csv_deque.hpp>
-#include <boost/assign/v2/fun.hpp>
#include <boost/assign/v2/put/pipe/csv_put.hpp>
+// Options come next
+#include <boost/assign/v2/optional/fun.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/range/algorithm/equal.hpp>
#include <libs/assign/v2/test/put/pipe/optional/fun.h>

Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/optional/lookup.cpp 2011-03-21 15:29:21 EDT (Mon, 21 Mar 2011)
@@ -12,9 +12,9 @@
#include <boost/lambda/lambda.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/assign/v2/detail/config/check.hpp>
-#include <boost/assign/v2/fun.hpp>
#include <boost/assign/v2/put/pipe/csv_put.hpp>
// Options come next
+#include <boost/assign/v2/optional/fun.hpp>
#include <boost/assign/v2/optional/lookup.hpp>
#include <libs/assign/v2/test/put/pipe/optional/lookup.h>

Date view	Thread view	Subject view	Author view

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