[Boost-commit] svn:boost r71110 - in sandbox/assign_v2: boost/assign/v2/include libs/assign/v2 libs/assign/v2/speed libs/assign/v2/src

Subject: [Boost-commit] svn:boost r71110 - in sandbox/assign_v2: boost/assign/v2/include libs/assign/v2 libs/assign/v2/speed libs/assign/v2/src
From: erwann.rogard_at_[hidden]
Date: 2011-04-07 23:54:19

Author: e_r
Date: 2011-04-07 23:54:18 EDT (Thu, 07 Apr 2011)
New Revision: 71110
URL: http://svn.boost.org/trac/boost/changeset/71110

Log:
upd assign_v2
Added:
   sandbox/assign_v2/boost/assign/v2/include/option.hpp   (contents, props changed)
Text files modified: 
   sandbox/assign_v2/libs/assign/v2/speed/test.cpp |    52 ++++++++++++++++++++--------------------
   sandbox/assign_v2/libs/assign/v2/src/main.cpp   |     8 +++---                                  
   sandbox/assign_v2/libs/assign/v2/tutorial.cpp   |     4 +-                                      
   3 files changed, 32 insertions(+), 32 deletions(-)

Added: sandbox/assign_v2/boost/assign/v2/include/option.hpp
==============================================================================
--- (empty file)
+++ sandbox/assign_v2/boost/assign/v2/include/option.hpp	2011-04-07 23:54:18 EDT (Thu, 07 Apr 2011)
@@ -0,0 +1,14 @@
+//////////////////////////////////////////////////////////////////////////////
+//  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_OPTION_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE_OPTION_ER_2010_HPP
+#include <boost/assign/v2/option.hpp>
+
+#endif // BOOST_ASSIGN_V2_INCLUDE_OPTION_ER_2010_HPP

Modified: sandbox/assign_v2/libs/assign/v2/speed/test.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/speed/test.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/speed/test.cpp	2011-04-07 23:54:18 EDT (Thu, 07 Apr 2011)
@@ -243,18 +243,18 @@
     BOOST_STATIC_ASSERT( total_sz/(128 * n) > 0); // Invariant : k * n * m = total_sz;
 
     std::map<str_, str_> cols;
-    cols["stl_push_back"] 		= 	"cont.push_back( arg1 ); ...; cont.push_back( argm )";
-    cols["v1_push_back"] 		=   "push_back( cont )( arg1 )...( argm )";
-    cols["v2_put"] 			=   "v2::put( cont )( arg1 )...( argm )";
-    //cols["v2_pipe_put"] 		=   "cont | v2::_put( arg1 )...( argm )";
-    cols["v2_csv_put"] 		= 	"cont | v2::csv_put( cont, args )";
-    cols["v2_pipe_csv_put"] 	= 	"cont | v2::delay_csv_put( v2::ref::csv_array( args... ) )";
-    cols["v1_list_of"] 		=   "list_of( arg1 )...( argm )";
-    cols["v2_deque"] 			=   "v2::deque<T>( arg1 )...( argm )";
-    cols["v2_csv_deque"] 		=   "v2::csv_deque( args... )";
-    cols["v1_cref_list_of"] 	= 	"cref_list_of<m>( arg1 )...( argm )";
-    cols["v2_ref_array"] 		=   "v2::ref::array( arg1 )...( argm )";
-    cols["v2_ref_csv_array"]	= 	"v2::ref::csv_array( args...)";
+    cols["stl_push_back"]         =     "cont.push_back( arg1 ); ...; cont.push_back( argm )";
+    cols["v1_push_back"]         =   "push_back( cont )( arg1 )...( argm )";
+    cols["v2_put"]             =   "v2::put( cont )( arg1 )...( argm )";
+    //cols["v2_pipe_put"]         =   "cont | v2::_put( arg1 )...( argm )";
+    cols["v2_csv_put"]         =     "cont | v2::csv_put( cont, args )";
+    cols["v2_pipe_csv_put"]     =     "cont | v2::delay_csv_put( v2::ref::csv_array( args... ) )";
+    cols["v1_list_of"]         =   "list_of( arg1 )...( argm )";
+    cols["v2_deque"]             =   "v2::deque<T>( arg1 )...( argm )";
+    cols["v2_csv_deque"]         =   "v2::csv_deque( args... )";
+    cols["v1_cref_list_of"]     =     "cref_list_of<m>( arg1 )...( argm )";
+    cols["v2_ref_array"]         =   "v2::ref::array( arg1 )...( argm )";
+    cols["v2_ref_csv_array"]    =     "v2::ref::csv_array( args...)";
 
     boost::format fn("%1% : %|30t|%2%\n");
     boost::format title("[%|=90|]\n");
@@ -265,18 +265,18 @@
 
     std::map<str_, str_> defs;
     boost::format fstat("%1% value of %1% * var_scaled, over k repetitions");
-    defs["T"] 			= "std::vector<int>";
-    defs["n"] 			= "Control a number of loops";
-    defs["k"] 			= "Control a number of loops";
-    defs["args..."] 	= "list of arguments, each of type T and max size ";
-    defs["args..."] 	+= ( boost::format("%1%") % T_size ).str();
-    defs["var"] 		= "time to eval method(args...) n times";
-    defs["var_scaled"] 	= ( boost::format("%1% * var") % scale_factor ).str();
-    defs["m"] 			= "size(args...)";
-    defs["min"] 		= ( fstat % "min" ).str();
-    defs["average"] 	= ( fstat % "average" ).str();
-    defs["min"] 		= ( fstat % "max" ).str();
-    defs["cumulated"] 	= ( fstat % "cumulate" ).str();
+    defs["T"]             = "std::vector<int>";
+    defs["n"]             = "Control a number of loops";
+    defs["k"]             = "Control a number of loops";
+    defs["args..."]     = "list of arguments, each of type T and max size ";
+    defs["args..."]     += ( boost::format("%1%") % T_size ).str();
+    defs["var"]         = "time to eval method(args...) n times";
+    defs["var_scaled"]     = ( boost::format("%1% * var") % scale_factor ).str();
+    defs["m"]             = "size(args...)";
+    defs["min"]         = ( fstat % "min" ).str();
+    defs["average"]     = ( fstat % "average" ).str();
+    defs["min"]         = ( fstat % "max" ).str();
+    defs["cumulated"]     = ( fstat % "cumulate" ).str();
 
     str_ notation = ( title % "Notation").str()
         + (fn % "T" % defs["T"]).str()
@@ -315,7 +315,7 @@
 
         for(int i = 0; i!= methods.size(); i++ )
         {
-        	str_ method = methods[i];
+            str_ method = methods[i];
             os << ( f % method % cols[ method ] ).str();
         }
     }
@@ -340,7 +340,7 @@
         os << vec_stat;\
     }\
 /**/
-
+    
 MACRO2(1)
 MACRO2(2)
 MACRO2(4)

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-04-07 23:54:18 EDT (Thu, 07 Apr 2011)
@@ -19,8 +19,8 @@
 #include <libs/assign/v2/tutorial.h>
 
 // Speed -- CPP0x required
-#include <fstream>
-#include <libs/assign/v2/speed/test.h>
+//#include <fstream>
+//#include <libs/assign/v2/speed/test.h>
 
 int main (int argc, char * const argv[])
 {
@@ -72,11 +72,11 @@
     {
         //tutorial_assign_v2::run();
     }
-    {
+    {/*
         using namespace speed_assign_v2;
         std::ofstream ofs("assign_v2_speed_test");
         speed_assign_v2::test(ofs);
-    }
+    */}
 
     return 0;
 

Modified: sandbox/assign_v2/libs/assign/v2/tutorial.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/tutorial.cpp	(original)
+++ sandbox/assign_v2/libs/assign/v2/tutorial.cpp	2011-04-07 23:54:18 EDT (Thu, 07 Apr 2011)
@@ -63,8 +63,8 @@
         }
         {
             //[tutorial_empty_deque
-            assert( deque<int>( _nil ).size() == 0 );	// Functor form
-            assert( csv_deque<int>().size() == 0 );		// Csv form
+            assert( deque<int>( _nil ).size() == 0 );    // Functor form
+            assert( csv_deque<int>().size() == 0 );        // Csv form
             //]
         }
         {