Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r72468 - in sandbox/assign_v2: boost/assign/v2/deque/csv_deque boost/assign/v2/put/csv_put libs/assign/v2/src libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/put libs/assign/v2/test/ref
From: erwann.rogard_at_[hidden]
Date: 2011-06-07 12:00:07

Author: e_r
Date: 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
New Revision: 72468
URL: http://svn.boost.org/trac/boost/changeset/72468

Log:
upd assign_v2
Text files modified:
   sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp | 19 ++-----------------
   sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp | 21 ++++-----------------
   sandbox/assign_v2/boost/assign/v2/put/csv_put/csv_put_ext.hpp | 12 ++----------
   sandbox/assign_v2/libs/assign/v2/src/main.cpp | 6 +++---
   sandbox/assign_v2/libs/assign/v2/test/chain.cpp | 2 +-
   sandbox/assign_v2/libs/assign/v2/test/conversion.cpp | 2 +-
   sandbox/assign_v2/libs/assign/v2/test/option/data.cpp | 4 ++--
   sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp | 3 ++-
   sandbox/assign_v2/libs/assign/v2/test/option/list.cpp | 18 +++++++++---------
   sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp | 2 +-
   sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp | 2 +-
   sandbox/assign_v2/libs/assign/v2/test/option/row_major.cpp | 5 ++---
   sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp | 4 +---
   sandbox/assign_v2/libs/assign/v2/test/put/csv_put_ext.cpp | 3 +--
   sandbox/assign_v2/libs/assign/v2/test/put/delay_csv_put.cpp | 1 -
   sandbox/assign_v2/libs/assign/v2/test/put/delay_put.cpp | 3 ++-
   sandbox/assign_v2/libs/assign/v2/test/put/put.cpp | 1 -
   sandbox/assign_v2/libs/assign/v2/test/ref/get.cpp | 22 +++++++++++-----------
   18 files changed, 45 insertions(+), 85 deletions(-)

Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_basic.hpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -16,16 +16,12 @@
#include <boost/assign/v2/support/pp/ignore.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <utility>
-#endif

namespace boost{
namespace assign{
namespace v2{
//[syntax_csv_deque_basic
namespace interpreter_aux{
-//<-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->

     // Explicit value
     template<typename T, typename... Args>
@@ -60,25 +56,14 @@
         );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/

-//<-
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
-
}// interpreter_aux
-//<-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
     using interpreter_aux::csv_deque;
-//<-
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
//]
}// v2
}// assign
}// boost

-#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
+#else
#include <boost/assign/v2/deque/cpp03/csv_deque_basic.hpp>
-#endif
-
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
#endif // BOOST_ASSIGN_V2_DEQUE_CSV_DEQUE_BASIC_ER_2011_HPP

Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque/csv_deque_ext.hpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -16,16 +16,12 @@
#include <boost/assign/v2/support/pp/ignore.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <utility>
-#endif

namespace boost{
namespace assign{
namespace v2{
//[syntax_csv_deque_ext
namespace interpreter_aux{
-//<-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->

     template<typename T, int I, typename...Types, typename... Args>
     typename result_of::csv_deque<T>::type
@@ -44,25 +40,16 @@
         return csv<I, Types...>( result, std::forward<Args>( args )... );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/

-//<-
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
-
}// interpreter_aux
-//<-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
+
     using interpreter_aux::csv_deque;
-//<-
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
//]
}// v2
}// assign
}// boost

-#if !BOOST_ASSIGN_V2_ENABLE_CPP0X
+#else
#include <boost/assign/v2/deque/cpp03/csv_deque_ext.hpp>
-#endif
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X

-#endif // BOOST_ASSIGN_V2_DEQUE_CSV_DEQUE_ER_2011_HPP
+#endif // BOOST_ASSIGN_V2_DEQUE_CSV_DEQUE_EXT_ER_2011_HPP

Modified: sandbox/assign_v2/boost/assign/v2/put/csv_put/csv_put_ext.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/csv_put/csv_put_ext.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/csv_put/csv_put_ext.hpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -9,20 +9,17 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_PUT_CSV_PUT_EXT_ER_2011_HPP
#define BOOST_ASSIGN_V2_PUT_CSV_PUT_EXT_ER_2011_HPP
+#include <boost/assign/v2/put/put.hpp>
#include <boost/assign/v2/interpreter/csv/csv_ext.hpp>
#include <boost/assign/v2/support/config/enable_cpp0x.hpp>
#if BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <utility>
-#endif

namespace boost{
namespace assign{
namespace v2{
//[syntax_csv_put_ext
namespace interpreter_aux{
-//<-
-#if BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->

     template<int I, typename ...Cast, typename C, typename... Args>
     void csv_put(C& cont, Args&&... args)/*<-*/
@@ -45,20 +42,15 @@
         );
     }BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/

-//<-
-#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
-//->
-
}// interpreter_aux

using interpreter_aux::csv_put;
//]
-
}// v2
}// assign
}// boost

-#if! BOOST_ASSIGN_V2_ENABLE_CPP0X
+#else
#include <boost/assign/v2/put/cpp03/csv_put_ext.hpp>
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X

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-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -75,11 +75,11 @@
     {
         //tutorial_assign_v2::run();
     }
- {
+ {/*
         using namespace speed_assign_v2;
- std::ofstream ofs("assign_v2_speed_test");
+ std::ofstream ofs( "assign_v2_speed_test" );
         speed_assign_v2::test(ofs);
- }
+ */}

     return 0;

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-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -12,7 +12,7 @@
#include <list>
#include <string>
#include <boost/assign/v2/include/ref/csv_array.hpp>
-#include <boost/assign/v2/include/csv_deque.hpp>
+#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>

Modified: sandbox/assign_v2/libs/assign/v2/test/conversion.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/conversion.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/conversion.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -12,7 +12,7 @@
#include <boost/assign/v2/conversion/check.hpp>
#include <boost/assign/v2/include/convert.hpp>
#include <boost/assign/v2/include/converter.hpp>
-#include <boost/assign/v2/include/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque_basic.hpp>
#include <boost/assign/v2/ref/array.hpp>
#include <boost/assign/v2/support/check/equal_container.hpp>
#include <boost/assign/v2/support/config/check.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/data.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/data.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -16,8 +16,8 @@
#include <boost/assign/v2/deque.hpp>
#include <boost/assign/v2/option/data.hpp>
#include <boost/assign/v2/interpreter/csv/csv_basic.hpp>
-#include <boost/assign/v2/include/csv_deque.hpp>
-#include <boost/assign/v2/include/csv_put.hpp>
+#include <boost/assign/v2/include/csv_deque_basic.hpp>
+#include <boost/assign/v2/include/csv_put_basic.hpp>
#include <boost/assign/v2/include/put.hpp>
#include <boost/assign/v2/include/deque.hpp>
#include <boost/assign/v2/support/config/check.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/iterate.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -10,7 +10,8 @@
#include <list>
#include <boost/array.hpp>
#include <boost/assign/v2/deque.hpp>
-#include <boost/assign/v2/include/csv_put.hpp>
+#include <boost/assign/v2/include/csv_basic.hpp>
+#include <boost/assign/v2/include/put.hpp>
#include <boost/assign/v2/support/config/check.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/mpl/assert.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/list.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/list.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/list.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -9,7 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#include <deque>
#include <boost/assign/v2/support/config/check.hpp>
-#include <boost/assign/v2/include/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque_basic.hpp>
#include <boost/assign/v2/option/list.hpp>
#include <boost/assign/v2/option/data.hpp>
#include <boost/assign/v2/option/modifier/std.hpp>
@@ -26,29 +26,29 @@
     void test()
     {
         namespace as2 = boost::assign::v2;
-
+
         {
             //[test_option_list
             std::deque<int> cont;
             ( as2::put( cont ) % as2::_option )( 4 )( 5 );
-
+
             BOOST_ASSIGN_V2_CHECK( cont[0] == 4 );
             BOOST_ASSIGN_V2_CHECK( cont[1] == 5 );

- BOOST_AUTO(
- options,
- as2::_push_front % ( as2::_data = ( boost::lambda::_1 % 10 ) )
+ BOOST_AUTO(
+ options,
+ as2::_push_front % ( as2::_data = ( boost::lambda::_1 % 10 ) )
             );
             ( as2::put( cont ) % options )( 13 )( 12 )( 11 );

- BOOST_ASSIGN_V2_CHECK(
- boost::range::equal( cont, as2::csv_deque( 1, 2, 3, 4, 5 ) )
+ BOOST_ASSIGN_V2_CHECK(
+ boost::range::equal( cont, as2::csv_deque( 1, 2, 3, 4, 5 ) )
             );
             //]
         }

     }
-
+
}// xxx_list
}// xxx_option
}// xxx_test_assign

Modified: sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/mapped.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -12,7 +12,7 @@
#include <cmath>
#include <list>
#include <boost/assign/v2/include/csv_basic.hpp>
-#include <boost/assign/v2/include/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque_basic.hpp>
#include <boost/assign/v2/include/csv_put_ext.hpp>
#include <boost/assign/v2/include/deque.hpp>
#include <boost/assign/v2/include/put.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/repeat.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -10,7 +10,7 @@
#include <vector>
#include <boost/typeof/typeof.hpp>
#include <boost/assign/v2/support/config/check.hpp>
-#include <boost/assign/v2/include/csv.hpp>
+#include <boost/assign/v2/include/csv_basic.hpp>
#include <boost/assign/v2/include/put.hpp>
#include <boost/assign/v2/include/delay_put.hpp>
#include <boost/assign/v2/option/modifier/std.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/row_major.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/row_major.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/row_major.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -7,13 +7,12 @@
// 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/support/config/enable_cpp0x.hpp>
-
-#include <boost/assign/v2/include/csv.hpp>
+#include <boost/assign/v2/include/csv_basic.hpp>
#include <boost/assign/v2/include/put.hpp>
#include <boost/assign/v2/option/data.hpp>
#include <boost/assign/v2/option/modifier/row_major.hpp>
#include <boost/assign/v2/support/config/check.hpp>
+#include <boost/assign/v2/support/config/enable_cpp0x.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/multi_array.hpp>
#include <boost/range/algorithm/equal.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/std_modifier.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -13,9 +13,7 @@
#include <set>
#include <string>
#include <boost/assign/v2/support/config/check.hpp>
-#include <boost/assign/v2/include/delay_csv_put.hpp>
-#include <boost/assign/v2/include/csv.hpp>
-#include <boost/assign/v2/include/csv_put.hpp>
+#include <boost/assign/v2/include/csv_put_basic.hpp>
#include <boost/assign/v2/include/put.hpp>
#include <boost/assign/v2/deque.hpp>
#include <boost/assign/v2/option/modifier/std.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/put/csv_put_ext.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/csv_put_ext.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/csv_put_ext.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -12,8 +12,7 @@
#include <map>
#include <string>
#include <vector>
-
-#include <boost/assign/v2/include/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque_basic.hpp>
#include <boost/assign/v2/include/csv_put_ext.hpp>
#include <boost/assign/v2/support/config/check.hpp>
#include <boost/assign/v2/support/config/enable_cpp0x.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-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -8,7 +8,6 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
#include <map>
-#include <boost/assign/v2/include/csv_deque.hpp>
#include <boost/assign/v2/include/delay_csv_put.hpp>
#include <boost/assign/v2/support/config/check.hpp>
#include <libs/assign/v2/test/put/delay_csv_put.h>

Modified: sandbox/assign_v2/libs/assign/v2/test/put/delay_put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/delay_put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/delay_put.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -11,7 +11,8 @@
#include <map>
#include <string>

-#include <boost/assign/v2/include/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque_basic.hpp>
+#include <boost/assign/v2/include/csv_deque_ext.hpp>
#include <boost/assign/v2/include/delay_put.hpp>
#include <boost/assign/v2/support/config/check.hpp>
#include <boost/assign/v2/support/config/enable_cpp0x.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/put/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/put.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -11,7 +11,6 @@
#include <map>
#include <vector>

-#include <boost/assign/v2/include/csv.hpp>
#include <boost/assign/v2/include/put.hpp>
#include <boost/assign/v2/support/config/check.hpp>
#include <boost/assign/v2/support/config/enable_cpp0x.hpp>

Modified: sandbox/assign_v2/libs/assign/v2/test/ref/get.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/ref/get.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/ref/get.cpp 2011-06-07 12:00:05 EDT (Tue, 07 Jun 2011)
@@ -11,14 +11,14 @@
#include <boost/range/begin.hpp>
#include <boost/assign/v2/include/ref/get.hpp>
#include <boost/assign/v2/ref/wrapper/copy.hpp>
-#include <boost/assign/v2/include/csv_deque.hpp>
+#include <boost/assign/v2/include/csv_deque_basic.hpp>
#include <boost/assign/v2/support/config/check.hpp>
#include <boost/range/algorithm/copy.hpp>
#include <libs/assign/v2/test/ref/wrapper.h>

namespace test_assign_v2{
namespace xxx_ref{
-namespace xxx_get{
+namespace xxx_get{

     void test()
     {
@@ -26,15 +26,15 @@
         namespace as2 = boost::assign::v2;
         typedef int T; typedef as2::ref::copy_wrapper<T>::type w_;
         boost::array<w_, 3> ref_array; int x, y, z;
-
- boost::copy(
- as2::csv_deque( w_( x ), w_( y ), w_( z ) ),
- boost::begin( ref_array )
+
+ boost::copy(
+ as2::csv_deque( w_( x ), w_( y ), w_( z ) ),
+ boost::begin( ref_array )
         );
- boost::copy(
- as2::csv_deque( 314, 3141, 31415 ),
- boost::begin(
- ref_array | as2::ref::_get
+ boost::copy(
+ as2::csv_deque( 314, 3141, 31415 ),
+ boost::begin(
+ ref_array | as2::ref::_get
             )
         );

@@ -46,4 +46,4 @@

}// xxx_get
}// xxx_ref
-}// test_assign_v2
\ No newline at end of file
+}// test_assign_v2

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