|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66882 - in sandbox/statistics/support/libs/assign/v2: example speed test/anon test/chain test/put
From: erwann.rogard_at_[hidden]
Date: 2010-11-30 00:19:28
Author: e_r
Date: 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
New Revision: 66882
URL: http://svn.boost.org/trac/boost/changeset/66882
Log:
cosmetic upd to libs/assign/v2
Text files modified:
sandbox/statistics/support/libs/assign/v2/example/anon.cpp | 8 +-
sandbox/statistics/support/libs/assign/v2/example/anon.h | 2
sandbox/statistics/support/libs/assign/v2/example/chain.cpp | 18 ++----
sandbox/statistics/support/libs/assign/v2/example/chain.h | 2
sandbox/statistics/support/libs/assign/v2/example/conversion.cpp | 4
sandbox/statistics/support/libs/assign/v2/example/conversion.h | 2
sandbox/statistics/support/libs/assign/v2/example/foo.cpp | 7 +-
sandbox/statistics/support/libs/assign/v2/example/fusion.cpp | 3
sandbox/statistics/support/libs/assign/v2/example/put_adaptor.cpp | 16 +++---
sandbox/statistics/support/libs/assign/v2/example/put_adaptor.h | 2
sandbox/statistics/support/libs/assign/v2/example/put_range.cpp | 6 +-
sandbox/statistics/support/libs/assign/v2/example/put_range.h | 2
sandbox/statistics/support/libs/assign/v2/example/ref_anon.cpp | 20 +++---
sandbox/statistics/support/libs/assign/v2/example/ref_anon.h | 2
sandbox/statistics/support/libs/assign/v2/speed/anon_put_ref.cpp | 8 +-
sandbox/statistics/support/libs/assign/v2/speed/tools.cpp | 8 +-
sandbox/statistics/support/libs/assign/v2/speed/tools.h | 8 +-
sandbox/statistics/support/libs/assign/v2/test/anon/anon.cpp | 23 +++-----
sandbox/statistics/support/libs/assign/v2/test/chain/convert.cpp | 39 +++++++-------
sandbox/statistics/support/libs/assign/v2/test/put/modulo_op.cpp | 6 +-
sandbox/statistics/support/libs/assign/v2/test/put/ptr.cpp | 52 +++++++++---------
sandbox/statistics/support/libs/assign/v2/test/put/static.cpp | 26 ++++-----
sandbox/statistics/support/libs/assign/v2/test/put/stl.cpp | 105 +++++++++++++++++++--------------------
sandbox/statistics/support/libs/assign/v2/test/put/tuple_refs.cpp | 2
24 files changed, 176 insertions(+), 195 deletions(-)
Modified: sandbox/statistics/support/libs/assign/v2/example/anon.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/anon.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/anon.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -15,18 +15,18 @@
namespace example_assign_v2{
namespace xxx_anon{
- void run(std::ostream& os)
+ void run(std::ostream& os)
{
- using namespace boost::assign::v2;
+ using namespace boost::assign::v2;
os << "* xxx_anon " << std::endl;
{
- os << "csv_anon" << ' ';
+ os << "csv_anon" << ' ';
//[csv_anon
boost::for_each( csv_anon<T>( x, y ,z ), printer(os) );
// outputs (1,0)(NULL,0)(1,5)
//]
os << std::endl;
- os << "anon" << ' ';
+ os << "anon" << ' ';
//[anon
boost::for_each(
(anon<T>( _nil ) % _push_front)( a )()( a, b ),
Modified: sandbox/statistics/support/libs/assign/v2/example/anon.h
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/anon.h (original)
+++ sandbox/statistics/support/libs/assign/v2/example/anon.h 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -14,7 +14,7 @@
namespace example_assign_v2{
namespace xxx_anon{
- void run(std::ostream& os);
+ void run(std::ostream& os);
}// xxx_anon
}// example_assign_v2
Modified: sandbox/statistics/support/libs/assign/v2/example/chain.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/chain.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/chain.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -18,13 +18,13 @@
namespace example_assign_v2{
namespace xxx_chain{
- void run(std::ostream& os)
+ void run(std::ostream& os)
{
using namespace boost::assign::v2;
os << "* xxx_chain" << std::endl;
- {
- os << "chain_read";
- //[chain_read
+ {
+ os << "chain_read";
+ //[chain_read
typedef boost::array<T, 1> cont1_; cont1_ cont1; cont1[0] = x;
typedef std::list<T> cont3_; cont3_ cont3; cont3.push_back( z );
using namespace adaptor;
@@ -34,7 +34,7 @@
printer( os )
);
// outputs (1,0)(NULL,0)(1,5)
- //]
+ //]
//[chain_write
T y1;
typedef std::vector<T> vec_; vec_ vec( 3, y );
@@ -49,13 +49,9 @@
BOOST_ASSERT( cont1[0] == y );
BOOST_ASSERT( y1 == y );
BOOST_ASSERT( cont3.front() == y1 );
- //]
+ //]
}
- {
-
- }
-
- }
+ }
}// xxx_chain
}// example_assign_v2
Modified: sandbox/statistics/support/libs/assign/v2/example/chain.h
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/chain.h (original)
+++ sandbox/statistics/support/libs/assign/v2/example/chain.h 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -14,7 +14,7 @@
namespace example_assign_v2{
namespace xxx_chain{
- void run(std::ostream& os);
+ void run(std::ostream& os);
}// xxx_chain
}// example_assign_v2
Modified: sandbox/statistics/support/libs/assign/v2/example/conversion.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/conversion.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/conversion.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -20,9 +20,9 @@
namespace example_assign_v2{
namespace xxx_conversion{
- void run(std::ostream& os)
+ void run(std::ostream& os)
{
- using namespace boost::assign::v2;
+ using namespace boost::assign::v2;
namespace ns_ref = ref::assign_copy;
{
{
Modified: sandbox/statistics/support/libs/assign/v2/example/conversion.h
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/conversion.h (original)
+++ sandbox/statistics/support/libs/assign/v2/example/conversion.h 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -14,7 +14,7 @@
namespace example_assign_v2{
namespace xxx_conversion{
- void run(std::ostream& os);
+ void run(std::ostream& os);
}// xxx_conversion
}// example_assign_v2
Modified: sandbox/statistics/support/libs/assign/v2/example/foo.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/foo.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/foo.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -30,10 +30,9 @@
}
make_foo::result_type make_foo::operator()(int& a, int const& b)const
- {
- return result_type( a, b );
- }
-
+{
+ return result_type( a, b );
+}
std::ostream& operator<<( std::ostream& os, foo const& t)
{
Modified: sandbox/statistics/support/libs/assign/v2/example/fusion.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/fusion.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/fusion.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -34,8 +34,7 @@
meta_result_,
boost::mpl::vector<t0_,t1_>
>::type result_;
- result_ result =
- ref::fusion<tag1_, tag2_, t0_>( _nil )( a )( 2 );
+ result_ result = ref::fusion<tag1_, tag2_, t0_>( _nil )( a )( 2 );
BOOST_ASSIGN_V2_CHECK_EQUAL( result[ 0 ] , a );
BOOST_ASSIGN_V2_CHECK_EQUAL( result[ 1 ] , 2 );
}
Modified: sandbox/statistics/support/libs/assign/v2/example/put_adaptor.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/put_adaptor.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/put_adaptor.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -21,9 +21,9 @@
namespace example_assign_v2{
namespace xxx_put_adaptor{
- void run(std::ostream& os)
+ void run(std::ostream& os)
{
- using namespace boost::assign::v2;
+ using namespace boost::assign::v2;
os << "* xxx_put_adaptor " << std::endl;
{
os << "vector" << ' ';
@@ -57,21 +57,21 @@
BOOST_ASSERT(
( cont | _put (key_z, z)(key_y, y)(key_x, x) )[key_x] == x
);
- //]
+ //]
}
{
os << "static_array" << ' ';
- //[static_array
+ //[static_array
typedef boost::array<T,3> cont_;
cont_ cont;
using namespace adaptor;
boost::for_each( cont | _csv_put( x, y, z ), printer(os) );
- //]
+ //]
os << std::endl;
}
{
os << "ptr_vector" << ' ';
- //[ptr_vector
+ //[ptr_vector
typedef boost::ptr_vector<T> cont_; cont_ cont;
using namespace adaptor;
boost::for_each(
@@ -163,7 +163,7 @@
//]
}
{
- os << std::endl;
+ os << std::endl;
os << "incr_lookup" << ' ';
//[incr_lookup
typedef std::map<S,int> cont_;
@@ -181,7 +181,7 @@
//]
}
{
- os << std::endl;
+ os << std::endl;
os << "complex_ex1" << ' ';
//[complex_ex1
typedef std::list<T> cont_;
Modified: sandbox/statistics/support/libs/assign/v2/example/put_adaptor.h
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/put_adaptor.h (original)
+++ sandbox/statistics/support/libs/assign/v2/example/put_adaptor.h 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -14,7 +14,7 @@
namespace example_assign_v2{
namespace xxx_put_adaptor{
- void run(std::ostream& os);
+ void run(std::ostream& os);
}// xxx_put_adaptor
}// example_assign_v2
Modified: sandbox/statistics/support/libs/assign/v2/example/put_range.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/put_range.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/put_range.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -17,11 +17,11 @@
namespace example_assign_v2{
namespace xxx_put_range{
- void run(std::ostream& os)
+ void run(std::ostream& os)
{
- using namespace boost::assign::v2;
+ using namespace boost::assign::v2;
{
- //[put_range_queue
+ //[put_range_queue
typedef std::vector<T> from_; from_ from( 3 );
from[0] = x; from[1] = y; from[2] = z;
typedef std::queue<T> to_; // FIFO
Modified: sandbox/statistics/support/libs/assign/v2/example/put_range.h
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/put_range.h (original)
+++ sandbox/statistics/support/libs/assign/v2/example/put_range.h 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -14,7 +14,7 @@
namespace example_assign_v2{
namespace xxx_put_range{
- void run(std::ostream& os);
+ void run(std::ostream& os);
}// xxx_put_range
}// example_assign_v2
Modified: sandbox/statistics/support/libs/assign/v2/example/ref_anon.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/ref_anon.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/example/ref_anon.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -16,29 +16,29 @@
namespace example_assign_v2{
namespace xxx_ref_anon{
- void run(std::ostream& os)
+ void run(std::ostream& os)
{
using namespace boost::assign::v2;
os << "* xxx_ref_anon " << std::endl;
{
- os << "ref::assign_copy::csv_anon";
- //[assign_copy_read
+ os << "ref::assign_copy::csv_anon";
+ //[assign_copy_read
namespace ns = ref::assign_copy;
boost::for_each( ns::csv_anon( x, y, z ), printer(os) );
//outputs (1,0)(NULL,0)(1,5)
//]
- //[assign_copy_write
+ //[assign_copy_write
T x1, y1, z1;
ns::csv_anon( x1, y1, z1 ).assign( T( b, a ) );
BOOST_ASSERT( y1 == T( b, a ) );
//]
- //[csv_anon_empty
- ns::csv_anon<T const>( _nil );
+ //[csv_anon_empty
+ ns::csv_anon<T const>( _nil );
//]
- }
+ }
{
- //[assign_rebind_read
+ //[assign_rebind_read
namespace ns = ref::assign_rebind;
typedef ns::nth_result_of::csv_anon<3, T const>::type result_;
result_ result = ns::csv_anon( x, y, z );
@@ -47,10 +47,10 @@
//[assign_rebind_write
T w = T( b, a ); result.assign( w );
BOOST_ASSERT( &result[ 1 ] == &w );
- //]
+ //]
}
{
- //[anon_read_empty
+ //[anon_read_empty
namespace ns = ref::assign_rebind;
typedef ns::nth_result_of::anon<2, T const>::type result1_;
result1_ result1 = ns::anon( x )( y );
Modified: sandbox/statistics/support/libs/assign/v2/example/ref_anon.h
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/example/ref_anon.h (original)
+++ sandbox/statistics/support/libs/assign/v2/example/ref_anon.h 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -14,7 +14,7 @@
namespace example_assign_v2{
namespace xxx_ref_anon{
- void run(std::ostream& os);
+ void run(std::ostream& os);
}// xxx_ref_anon
}// example_assign_v2
Modified: sandbox/statistics/support/libs/assign/v2/speed/anon_put_ref.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/speed/anon_put_ref.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/speed/anon_put_ref.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -39,18 +39,18 @@
void run(std::ostream& os)
{
- using namespace boost::assign;
+ using namespace boost::assign;
using namespace v2;
- os << "-> Runtime efficiency " << std::endl;
+ os << "-> Runtime efficiency " << std::endl;
- typedef boost::timer timer_;
+ typedef boost::timer timer_;
typedef std::string str_;
typedef boost::format f_;
// [---- Warning : don't override these markups as they are used by the doc
- //[types
+ //[types
typedef std::vector<int> elem_; // T
// This STL container is of the same type as that internally used by the
// anon container of values, so we have a common basis for comparing
Modified: sandbox/statistics/support/libs/assign/v2/speed/tools.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/speed/tools.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/speed/tools.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////////
-// Copyright 2010 Manuel Peinado Gallego //
-// Distributed under 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) //
+// Copyright 2010 Manuel Peinado Gallego //
+// Distributed under 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) //
///////////////////////////////////////////////////////////////////////////////
#include <ctime>
#include <algorithm>
Modified: sandbox/statistics/support/libs/assign/v2/speed/tools.h
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/speed/tools.h (original)
+++ sandbox/statistics/support/libs/assign/v2/speed/tools.h 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////////
-// Copyright 2010 Manuel Peinado Gallego //
-// Distributed under 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) //
+// Copyright 2010 Manuel Peinado Gallego //
+// Distributed under 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 LIBS_ASSIGN_V2_SPEED_TOOLS_MPG_2010_H
#define LIBS_ASSIGN_V2_SPEED_TOOLS_MPG_2010_H
Modified: sandbox/statistics/support/libs/assign/v2/test/anon/anon.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/anon/anon.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/anon/anon.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -20,7 +20,6 @@
#include <boost/assign/v2/detail/checking/container.hpp>
#include <boost/assign/v2/detail/checking/constants.hpp>
#include <boost/assign/v2/detail/checking/relational_op.hpp>
-#include <boost/assign/v2/detail/checking/check_convert.hpp>
#include <boost/assign/v2/anon.hpp>
@@ -39,7 +38,6 @@
using namespace checking::container;
do_check( csv_anon( a, b, c, d, e, f, g, h ) );
}
-/*
{
// Operator%
BOOST_AUTO(tmp, ( anon<int>( _nil ) % (_repeat = 3) ) );
@@ -57,38 +55,36 @@
from = csv_anon( a, b, c, d, e, f, g, h );
}
using namespace checking::container;
+#define MACRO do_check( from | adaptor::put_convert<to_>() );
{
typedef boost::array<int,8> to_;
- BOOST_ASSIGN_V2_check_convert
- {
- to_ to; to = from;
- }
+ MACRO
}
{
typedef std::deque<int> to_;
- BOOST_ASSIGN_V2_check_convert
+ MACRO
}
{
typedef std::list<int> to_;
- BOOST_ASSIGN_V2_check_convert
+ MACRO
}
{
typedef std::queue<int> to_;
- BOOST_ASSIGN_V2_check_convert
+ MACRO
}
{
typedef std::set<int> to_;
- BOOST_ASSIGN_V2_check_convert
+ MACRO
}
{
typedef std::stack<int> to_;
- BOOST_ASSIGN_V2_check_convert
+ MACRO
}
{
typedef std::vector<int> to_;
- BOOST_ASSIGN_V2_check_convert
+ MACRO
}
-#undef BOOST_ASSIGN_V2_check_convert
+#undef MACRO
}
{ // Relational
using namespace checking::constants;
@@ -97,7 +93,6 @@
csv_anon( a, b, c, d, e, f, g, h )
);
}
-*/
}
}// xxx_anon
Modified: sandbox/statistics/support/libs/assign/v2/test/chain/convert.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/chain/convert.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/chain/convert.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -20,7 +20,6 @@
#include <boost/assign/v2/put/range.hpp>
#include <boost/assign/v2/detail/checking/container.hpp>
#include <boost/assign/v2/detail/checking/constants.hpp>
-// #include <boost/assign/v2/detail/checking/check_convert.hpp> // TODO remove
#include <libs/assign/v2/test/chain/convert.h>
namespace test_assign_v2{
@@ -54,12 +53,12 @@
cont1 | adaptor::_chain( cont2 ) | adaptor::_chain(cont3)
);
{ // Conversion
- using namespace checking::container;
- {
- typedef boost::array<int,8> to_;
+ using namespace checking::container;
+ {
+ typedef boost::array<int,8> to_;
MACRO
- }
- {
+ }
+ {
typedef std::deque<int> to_;
MACRO
}
@@ -67,22 +66,22 @@
typedef std::list<int> to_;
MACRO
}
- {
- typedef std::queue<int> to_;
- MACRO
- }
- {
- typedef std::set<int> to_;
- MACRO
- }
- {
- typedef std::stack<int> to_;
+ {
+ typedef std::queue<int> to_;
MACRO
- }
- {
- typedef std::vector<int> to_;
+ }
+ {
+ typedef std::set<int> to_;
+ MACRO
+ }
+ {
+ typedef std::stack<int> to_;
+ MACRO
+ }
+ {
+ typedef std::vector<int> to_;
MACRO
- }
+ }
#undef MACRO
}
}
Modified: sandbox/statistics/support/libs/assign/v2/test/put/modulo_op.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/put/modulo_op.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/put/modulo_op.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -20,10 +20,10 @@
void test()
{
- using namespace boost::assign::v2;
+ using namespace boost::assign::v2;
using namespace checking::constants;
namespace chk_cont = checking::container;
- { // Queue + Repeat
+ { // Queue + Repeat
typedef std::queue<int> cont_;
cont_ cont;
( put( cont ) % ( _repeat = 3 ) )( -1 );
@@ -31,7 +31,7 @@
BOOST_ASSIGN_V2_CHECK_EQUAL( cont.front(), -1); cont.pop();
BOOST_ASSIGN_V2_CHECK_EQUAL( cont.front(), -1); cont.pop();
BOOST_ASSIGN_V2_CHECK_EQUAL( cont.empty(), true);
- }
+ }
{ // Map + IncrLookup
{
typedef std::map<const char*, int> cont_;
Modified: sandbox/statistics/support/libs/assign/v2/test/put/ptr.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/put/ptr.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/put/ptr.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -24,61 +24,61 @@
namespace xxx_ptr{
void test(){
- using namespace boost::assign::v2;
- { // Array
+ using namespace boost::assign::v2;
+ { // Array
{
- typedef boost::ptr_array<int,8> cont_;
+ typedef boost::ptr_array<int,8> cont_;
cont_ cont;
{
- using namespace checking::constants;
+ using namespace checking::constants;
using namespace checking::container;
- do_check(
- csv_put( cont )
- ( a , b , c , d , e , f , g , h ).unwrap()
- );
+ do_check(
+ csv_put( cont )
+ ( a , b , c , d , e , f , g , h ).unwrap()
+ );
}
- }
+ }
}
- { // Sequence
+ { // Sequence
{
- typedef boost::ptr_deque<int> cont_;
+ typedef boost::ptr_deque<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
+ using namespace checking::constants;
+ using namespace checking::container;
do_check(
- put( cont )
- ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
+ put( cont )
+ ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
}// ptr_deque
{
- typedef boost::ptr_list<int> cont_;
+ typedef boost::ptr_list<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
+ using namespace checking::constants;
+ using namespace checking::container;
do_check(
- put( cont )
- ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
+ put( cont )
+ ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
}// ptr_list
{
- typedef boost::ptr_vector<int> cont_;
+ typedef boost::ptr_vector<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
+ using namespace checking::constants;
+ using namespace checking::container;
do_check(
- put( cont )
- ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
+ put( cont )
+ ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
}// ptr_vector
}// Sequence
- }// test
+ }// test
}// xxx_ptr
}// xxx_put
Modified: sandbox/statistics/support/libs/assign/v2/test/put/static.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/put/static.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/put/static.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -7,10 +7,6 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-
-// TODO : the forward declarations are not sufficient as the default
-// arguments aren't specified. If they were, redefinition error. Is there
-// a better way?
#include <deque>
#include <list>
#include <map>
@@ -35,7 +31,7 @@
namespace xxx_put{
namespace xxx_static{
-#define LIBS_ASSIGN_V2_TEST_PUT_static( V, T0, T1, n )\
+#define MACRO( V, T0, T1, n )\
{ \
typedef V< T0 BOOST_PP_COMMA_IF(n) BOOST_PP_EXPR_IF(n, T1) > cont_; \
typedef put_aux::deduce_modifier<cont_>::type found_; \
@@ -50,31 +46,31 @@
typedef modifier_tag::push_back wanted_;
LIBS_ASSIGN_V2_TEST_PUT_static( std::list, int, , 0 )
LIBS_ASSIGN_V2_TEST_PUT_static( std::vector, int, , 0 )
- LIBS_ASSIGN_V2_TEST_PUT_static( std::deque, int, , 0 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( std::deque, int, , 0 )
- LIBS_ASSIGN_V2_TEST_PUT_static( boost::ptr_deque, int, , 0 )
- LIBS_ASSIGN_V2_TEST_PUT_static( boost::ptr_list, int, , 0 )
- LIBS_ASSIGN_V2_TEST_PUT_static( boost::ptr_vector, int, , 0 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( boost::ptr_deque, int, , 0 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( boost::ptr_list, int, , 0 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( boost::ptr_vector, int, , 0 )
}
{
typedef modifier_tag::at_next wanted_;
- LIBS_ASSIGN_V2_TEST_PUT_static( boost::array, int, 1, 1 )
- LIBS_ASSIGN_V2_TEST_PUT_static( boost::ptr_array, int, 1, 1 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( boost::array, int, 1, 1 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( boost::ptr_array, int, 1, 1 )
}
{
typedef modifier_tag::push wanted_;
- LIBS_ASSIGN_V2_TEST_PUT_static( std::queue, int, , 0 )
- LIBS_ASSIGN_V2_TEST_PUT_static( std::stack, int, ,0 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( std::queue, int, , 0 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( std::stack, int, ,0 )
}
{
typedef modifier_tag::insert wanted_;
LIBS_ASSIGN_V2_TEST_PUT_static( std::set, int, , 0 )
- LIBS_ASSIGN_V2_TEST_PUT_static( std::map, const char* , int, 1 )
+ LIBS_ASSIGN_V2_TEST_PUT_static( std::map, const char* , int, 1 )
}
}
-#undef LIBS_ASSIGN_V2_TEST_PUT_static
+#undef MACRO
}// xxx_static
}// xxx_put
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 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -17,9 +17,6 @@
#include <set>
#include <stack>
#include <vector>
-
-//#include <boost/assign/v2/detail/checking/constants.hpp>
-//#include <boost/assign/v2/detail/checking/container.hpp>
#include <boost/assign/v2.hpp>
#include <libs/assign/v2/test/put/stl.h>
@@ -28,72 +25,72 @@
namespace xxx_put{
namespace xxx_stl{
- void test(){
- using namespace boost::assign::v2;
+ void test(){
+ using namespace boost::assign::v2;
{ // Array
-
+
{
- typedef boost::array<int,8> cont_;
+ typedef boost::array<int,8> cont_;
cont_ cont;
{
- using namespace checking::constants;
- put( cont )( a )( b )( c )( d )( e )( f )( g )( h );
+ using namespace checking::constants;
+ put( cont )( a )( b )( c )( d )( e )( f )( g )( h );
}
{
- using namespace checking::container;
- do_check( cont );
+ using namespace checking::container;
+ do_check( cont );
}
- }
+ }
}
{ // Associative
{
- typedef std::map<int,int> cont_;
+ typedef std::map<int,int> cont_;
cont_ cont;
{
- using namespace checking::container;
+ using namespace checking::container;
using namespace checking::constants;
do_check(
- put( cont )
- ( a, a )( b, b )( c, c )
- ( d, d )( e, e )( f, f )
- ( g, g )( h, h ).unwrap()
+ put( cont )
+ ( a, a )( b, b )( c, c )
+ ( d, d )( e, e )( f, f )
+ ( g, g )( h, h ).unwrap()
);
}
}// map
{
typedef std::set<int> cont_;
- cont_ cont;
- {
- using namespace checking::container;
- using namespace checking::constants;
- do_check(
- put( cont )
- ( a )( b )( c )
- ( d )( e )( f )
- ( g )( h ).unwrap()
- );
- }
+ cont_ cont;
+ {
+ using namespace checking::container;
+ using namespace checking::constants;
+ do_check(
+ put( cont )
+ ( a )( b )( c )
+ ( d )( e )( f )
+ ( g )( h ).unwrap()
+ );
+ }
}// map
}// Associative
{
- // Sequence
+ // Sequence
{
typedef std::deque<int> cont_;
- cont_ cont;
- {
- using namespace checking::constants;
- using namespace checking::container;
- do_check(
- put( cont )
- ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
- );
- }
+ cont_ cont;
+ {
+ using namespace checking::constants;
+ using namespace checking::container;
+ do_check(
+ put( cont )
+ ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
+ );
+ }
}// deque
{
typedef std::list<int> cont_;
- cont_ cont;
- {
+ cont_ cont;
+ {
using namespace checking::constants;
using namespace checking::container;
do_check(
@@ -116,34 +113,34 @@
}// vector
} // Sequence
{
- // Push
+ // Push
{
- typedef std::queue<int> cont_;
+ typedef std::queue<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
+ using namespace checking::constants;
+ using namespace checking::container;
do_check(
- put( cont )
- ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
+ put( cont )
+ ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
}// queue
- // Push
+ // Push
{
- typedef std::stack<int> cont_;
+ typedef std::stack<int> cont_;
cont_ cont;
{
- using namespace checking::constants;
- using namespace checking::container;
+ using namespace checking::constants;
+ using namespace checking::container;
do_check(
- put( cont )
- ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
+ put( cont )
+ ( a )( b )( c )( d )( e )( f )( g )( h ).unwrap()
);
}
}// queue
}// Push
- }// test()
+ }// test()
}// xxx_stl
}// xxx_put
Modified: sandbox/statistics/support/libs/assign/v2/test/put/tuple_refs.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/put/tuple_refs.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/put/tuple_refs.cpp 2010-11-30 00:19:19 EST (Tue, 30 Nov 2010)
@@ -19,7 +19,7 @@
void test()
{
- using namespace boost::assign::v2;
+ using namespace boost::assign::v2;
using namespace checking::constants;
{
int a1, b1, c1, d1;//, e1, f1, g1, h1;
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