Subject: [Boost-commit] svn:boost r72487 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/chain libs/assign/v2/test libs/assign/v2/test/put
From: erwann.rogard_at_[hidden]
Date: 2011-06-08 10:18:03
Author: e_r
Date: 2011-06-08 10:18:01 EDT (Wed, 08 Jun 2011)
New Revision: 72487
URL: http://svn.boost.org/trac/boost/changeset/72487
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/chain.hpp | 5 ++-
sandbox/assign_v2/boost/assign/v2/chain/logical_and.hpp | 42 ---------------------------------------
sandbox/assign_v2/libs/assign/v2/test/chain.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp | 6 -----
4 files changed, 5 insertions(+), 50 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/chain.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/chain.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/chain.hpp 2011-06-08 10:18:01 EDT (Wed, 08 Jun 2011)
@@ -11,7 +11,8 @@
#define BOOST_ASSIGN_V2_CHAIN_ER_2011_HPP
#include <boost/assign/v2/chain/chain.hpp>
-// keep commented out as it is optional:
-// #include <boost/assign/v2/chain/logical_and.hpp>
+// This header :
+// #include <boost/assign/v2/chain/operator.hpp>
+// is commented out because operator&& overloading is controversial
#endif // BOOST_ASSIGN_V2_CHAIN_ER_2011_HPP
Modified: sandbox/assign_v2/boost/assign/v2/chain/logical_and.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/chain/logical_and.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/chain/logical_and.hpp 2011-06-08 10:18:01 EDT (Wed, 08 Jun 2011)
@@ -1,41 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2009 Neil Groves //
-// Copyright (C) 2011 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_CHAIN_LOGICAL_AND_ER_2011_HPP
-#define BOOST_ASSIGN_V2_CHAIN_LOGICAL_AND_ER_2011_HPP
-#include <boost/assign/v2/chain/meta.hpp>
-#include <boost/assign/v2/chain/chain.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-
-#define BOOST_ASSIGN_V2_MACRO(U1, U2) \
-template<typename R1, typename R2> \
-typename result_of::chain< \
- U1,\
- U2 \
->::type \
-operator&&(U1& r1, U2 & r2) \
-{ \
- return r1 | _chain( r2 ); \
-} \
-/**/
-BOOST_ASSIGN_V2_MACRO( R1 , R2 )
-BOOST_ASSIGN_V2_MACRO( R1 , R2 const )
-BOOST_ASSIGN_V2_MACRO( R1 const, R2 )
-BOOST_ASSIGN_V2_MACRO( R1 const, R2 const )
-#undef BOOST_ASSIGN_V2_MACRO
-
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_CHAIN_OPERATOR_AND_ER_2011_HPP
\ No newline at end of file
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/libs/assign/v2/test/chain.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/chain.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/chain.cpp 2011-06-08 10:18:01 EDT (Wed, 08 Jun 2011)
@@ -15,7 +15,7 @@
#include <boost/assign/v2/include/csv_deque_basic.hpp>
#include <boost/assign/v2/include/chain.hpp>
#include <boost/assign/v2/chain/check.hpp>
-#include <boost/assign/v2/chain/logical_and.hpp>
+#include <boost/assign/v2/chain/operator.hpp>
#include <boost/next_prior.hpp>
#include <boost/range/algorithm/copy.hpp>
#include <boost/range/algorithm/equal.hpp>
Modified: sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp 2011-06-08 10:18:01 EDT (Wed, 08 Jun 2011)
@@ -12,12 +12,6 @@
#include <boost/assign/v2/support/config/check.hpp>
#include <libs/assign/v2/test/put/delay_csv_put.h>
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-// TODO remove
-#include <iostream>
-#include <tuple>
-#endif
-
namespace test_assign_v2{
namespace xxx_put{
namespace xxx_delay_csv_put{