|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r67976 - in sandbox/statistics/support/libs/assign/v2: example example/misc example/put example/ref src test/misc test/put test/ref
From: erwann.rogard_at_[hidden]
Date: 2011-01-11 15:56:25
Author: e_r
Date: 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
New Revision: 67976
URL: http://svn.boost.org/trac/boost/changeset/67976
Log:
upd libs/assign/v2
Text files modified:
sandbox/statistics/support/libs/assign/v2/example/misc.cpp | 3 +
sandbox/statistics/support/libs/assign/v2/example/misc/chain.cpp | 7 +--
sandbox/statistics/support/libs/assign/v2/example/put.cpp | 1
sandbox/statistics/support/libs/assign/v2/example/put/deque.cpp | 5 +-
sandbox/statistics/support/libs/assign/v2/example/put/pipe.cpp | 15 ++------
sandbox/statistics/support/libs/assign/v2/example/ref.cpp | 1
sandbox/statistics/support/libs/assign/v2/example/ref/array.cpp | 5 +-
sandbox/statistics/support/libs/assign/v2/src/main.cpp | 1
sandbox/statistics/support/libs/assign/v2/test/misc/chain.cpp | 4 +-
sandbox/statistics/support/libs/assign/v2/test/put/stl.cpp | 71 ++++++++++++++++++++-------------------
sandbox/statistics/support/libs/assign/v2/test/ref/wrapper.cpp | 6 +-
11 files changed, 59 insertions(+), 60 deletions(-)
Modified: sandbox/statistics/support/libs/assign/v2/example/misc.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/misc.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/misc.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -9,6 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#include <libs/assign/v2/example/misc/chain.h>
#include <libs/assign/v2/example/misc/convert.h>
+#include <libs/assign/v2/example/misc/sub_range.h>
#include <libs/assign/v2/example/misc.h>
namespace example_assign_v2{
@@ -16,8 +17,10 @@
void run(std::ostream& os)
{
+ os << "** xxx_misc" << std::endl;
xxx_chain::run( os );
xxx_convert::run( os );
+ xxx_sub_range::run( os );
}
}// xxx_misc
Modified: sandbox/statistics/support/libs/assign/v2/example/misc/chain.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/misc/chain.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/misc/chain.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -10,7 +10,7 @@
#include <vector>
#include <list>
#include <boost/array.hpp>
-#include <boost/assign/v2/chain.hpp>
+#include <boost/assign/v2/misc/chain.hpp>
#include <boost/assign/v2/put/deque.hpp>
#include <libs/assign/v2/example/include.h>
#include <libs/assign/v2/example/misc/chain.h>
@@ -23,7 +23,6 @@
{
os << "* xxx_chain" << std::endl;
{
- os << "chain_read ";
//[chain_r
boost::array<int, 2> ar; ar[0] = 0; ar[1] = 1;
std::list<int> list( 1, 2 );
@@ -33,9 +32,10 @@
os << bl::_1 << ' '
); // outputs 0, 1, 2, 3, 4
//]
+ os << std::endl;
}
{
- //[chain_w
+ //[chain_w
int const x = -1; int y; boost::array<int, 2> ar;
boost::copy(
std::vector<int>(3, x),
@@ -50,7 +50,6 @@
assert( y == x );
//]
}
- os << std::endl;
}
}// xxx_chain
Modified: sandbox/statistics/support/libs/assign/v2/example/put.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/put.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/put.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -17,6 +17,7 @@
namespace xxx_put{
void run(std::ostream& os){
+ os << "** xxx_put" << std::endl;
xxx_deque::run( os );
xxx_range::run( os );
xxx_pipe::run( os );
Modified: sandbox/statistics/support/libs/assign/v2/example/put/deque.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/put/deque.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/put/deque.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -22,7 +22,6 @@
{
os << "* xxx_deque " << std::endl;
{
- os << "csv_deque" << ' ';
//[csv_deque
boost::for_each(
as2::csv_deque<std::string>("x", "y", "z" ),
@@ -30,7 +29,6 @@
); // outputs x, y, z
//]
os << std::endl;
- os << "deque" << ' ';
{
assert( as2::deque<Foo>().size() == 1 );
}
@@ -43,6 +41,7 @@
);
// outputs (0,0)(NULL,0)(1,-1)
//]
+ os << std::endl;
}
{
//[deque_front
@@ -54,9 +53,9 @@
);
// outputs 1 0 -1
//]
+ os << std::endl;
}
}
- os << std::endl;
}
}// xxx_deque
Modified: sandbox/statistics/support/libs/assign/v2/example/put/pipe.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/put/pipe.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/put/pipe.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -28,11 +28,10 @@
void run(std::ostream& os)
{
- os << "* xxx_put_operator " << std::endl;
+ os << "* xxx_pipe " << std::endl;
namespace as2 = ::boost::assign::v2;
namespace bl = ::boost::lambda;
{
- os << "vector" << ' ';
//[vector
std::vector<int> cont;
boost::for_each(
@@ -69,7 +68,6 @@
//]
}
{
- os << "array" << ' ';
//[array
boost::array<int,3> cont;
boost::for_each(
@@ -80,7 +78,6 @@
os << std::endl;
}
{
- os << "ptr_vector" << ' ';
//[ptr_vector
boost::ptr_vector<int> cont;
boost::for_each(
@@ -91,7 +88,6 @@
os << std::endl;
}
{
- os << "list" << ' ';
//[list
std::list<int> cont;
boost::for_each(
@@ -104,9 +100,6 @@
os << std::endl;
}
{
- os << std::endl;
- os << "fun" << ' ';
-
//[fun
std::vector<int> cont;
boost::for_each(
@@ -118,8 +111,8 @@
os << bl::_1 << ' '
); // outputs -2 0 2
//]
+ os << std::endl;
}
- os << "repeat" << ' ';
{
//[repeat
std::vector<int> cont;
@@ -130,6 +123,7 @@
os << bl::_1 << ' '
); // outputs -1 -1 0 0 1 1
//]
+ os << std::endl;
}
{
//[lookup
@@ -149,9 +143,8 @@
os << bl::_1 << ' '
); // outputs -1 0 1
//]
+ os << std::endl;
}
-
- os << std::endl;
}
}// xxx_pipe
Modified: sandbox/statistics/support/libs/assign/v2/example/ref.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/ref.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/ref.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -14,6 +14,7 @@
namespace xxx_ref{
void run(std::ostream& os){
+ os << "** xxx_ref" << std::endl;
xxx_array::run( os );
}
Modified: sandbox/statistics/support/libs/assign/v2/example/ref/array.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/ref/array.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/ref/array.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -26,7 +26,7 @@
namespace as2 = boost::assign::v2;
namespace bl = boost::lambda;
- os << "* xxx_ref_array " << std::endl;
+ os << "* xxx_array " << std::endl;
{
//[csv_array_r
@@ -35,6 +35,7 @@
os << bl::_1 << ' '
); //outputs x y z
//]
+ os << std::endl;
//[csv_array_w
std::string x, y, z;
as2::ref::csv_array( x, y, z ).assign( "w" );
@@ -51,9 +52,9 @@
os << bl::_1 << ' '
); // outputs -1 0 1
//]
+ os << std::endl;
}
- os << std::endl;
}
}// xxx_array
Modified: sandbox/statistics/support/libs/assign/v2/src/main.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/src/main.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/src/main.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -7,7 +7,6 @@
#include <libs/assign/v2/example/ref.h>
#include <libs/assign/v2/example/put.h>
#include <libs/assign/v2/example/misc.h>
-#include <boost/assign/v2/put/pipe/range.hpp>
int main (int argc, char * const argv[])
{
Modified: sandbox/statistics/support/libs/assign/v2/test/misc/chain.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/misc/chain.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/misc/chain.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#include <boost/assign/v2/chain/checking/twin_values.hpp>
-#include <boost/assign/v2/chain/checking/distinct_values.hpp>
+#include <boost/assign/v2/misc/chain/checking/twin_values.hpp>
+#include <boost/assign/v2/misc/chain/checking/distinct_values.hpp>
#include <libs/assign/v2/test/misc/chain.h>
namespace test_assign_v2{
Modified: sandbox/statistics/support/libs/assign/v2/test/put/stl.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/put/stl.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/put/stl.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -17,7 +17,10 @@
#include <set>
#include <stack>
#include <vector>
-#include <boost/assign/v2.hpp>
+#include <boost/assign/v2/put.hpp>
+#include <boost/assign/v2/detail/checking/constants.hpp>
+#include <boost/assign/v2/detail/checking/container.hpp>
+
#include <libs/assign/v2/test/put/stl.h>
@@ -26,19 +29,19 @@
namespace xxx_stl{
void test(){
- using namespace boost::assign::v2;
+ namespace as2 = boost::assign::v2;
{ // Array
{
typedef boost::array<int,8> cont_;
cont_ cont;
{
- using namespace checking::constants;
- put( cont )( a )( b )( c )( d )( e )( f )( g )( h );
+ using namespace as2::checking::constants;
+ as2::put( cont )( a )( b )( c )( d )( e )( f )( g )( h );
}
{
- using namespace checking::container;
- do_check( cont );
+ namespace ns = as2::checking::container;
+ ns::do_check( cont );
}
}
}
@@ -48,10 +51,10 @@
typedef std::map<int,int> cont_;
cont_ cont;
{
- using namespace checking::container;
- using namespace checking::constants;
- do_check(
- put( cont )
+ namespace ns = as2::checking::container;
+ using namespace as2::checking::constants;
+ ns::do_check(
+ as2::put( cont )
( a, a )( b, b )( c, c )
( d, d )( e, e )( f, f )
( g, g )( h, h ).unwrap()
@@ -62,10 +65,10 @@
typedef std::set<int> cont_;
cont_ cont;
{
- using namespace checking::container;
- using namespace checking::constants;
- do_check(
- put( cont )
+ namespace ns = as2::checking::container;
+ using namespace as2::checking::constants;
+ ns::do_check(
+ as2::put( cont )
( a )( b )( c )
( d )( e )( f )
( g )( h ).unwrap()
@@ -79,10 +82,10 @@
typedef std::deque<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
- do_check(
- put( cont )
+ using namespace as2::checking::constants;
+ namespace ns = as2::checking::container;
+ ns::do_check(
+ as2::put( cont )
( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
@@ -91,10 +94,10 @@
typedef std::list<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
- do_check(
- put( cont )
+ using namespace as2::checking::constants;
+ namespace ns = as2::checking::container;
+ ns::do_check(
+ as2::put( cont )
( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
@@ -103,10 +106,10 @@
typedef std::vector<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
- do_check(
- put( cont )
+ using namespace as2::checking::constants;
+ namespace ns = as2::checking::container;
+ ns::do_check(
+ as2::put( cont )
( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
@@ -118,10 +121,10 @@
typedef std::queue<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
- do_check(
- put( cont )
+ using namespace as2::checking::constants;
+ namespace ns = as2::checking::container;
+ ns::do_check(
+ as2::put( cont )
( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
@@ -131,10 +134,10 @@
typedef std::stack<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
- do_check(
- put( cont )
+ using namespace as2::checking::constants;
+ namespace ns = as2::checking::container;
+ ns::do_check(
+ as2::put( cont )
( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
Modified: sandbox/statistics/support/libs/assign/v2/test/ref/wrapper.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/ref/wrapper.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/ref/wrapper.cpp 2011-01-11 15:56:21 EST (Tue, 11 Jan 2011)
@@ -22,7 +22,7 @@
using namespace boost::assign::v2;
typedef int val_;
{
- typedef ref::type_traits::copy_wrapper<val_>::type w_;
+ typedef ref::copy_wrapper<val_>::type w_;
w_ w;
val_ a = 1, b = 2, c = 3;
w.rebind( a ); BOOST_ASSIGN_V2_CHECK( &w.unwrap() == &a );
@@ -30,7 +30,7 @@
w = c; BOOST_ASSIGN_V2_CHECK( a == c );
}
{
- typedef ref::type_traits::copy_wrapper<val_ const>::type w_;
+ typedef ref::copy_wrapper<val_ const>::type w_;
w_ w;
val_ a = 1;
w.rebind( a ); BOOST_ASSIGN_V2_CHECK( &w.unwrap() == &a );
@@ -40,7 +40,7 @@
typedef val_ const cval_;
typedef ref::wrapper_param<val_>::type param_;
BOOST_MPL_ASSERT(( boost::is_same<param_, cval_> ));
- typedef ref::type_traits::copy_wrapper<param_>::type w_;
+ typedef ref::copy_wrapper<param_>::type w_;
{
val_&& a = 1;
w_ w( a );
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