|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r60386 - in sandbox/statistics/detail/assign: boost/assign/auto_size boost/assign/auto_size/detail libs/assign/example libs/assign/src libs/assign/test
From: erwann.rogard_at_[hidden]
Date: 2010-03-09 15:05:08
Author: e_r
Date: 2010-03-09 15:05:06 EST (Tue, 09 Mar 2010)
New Revision: 60386
URL: http://svn.boost.org/trac/boost/changeset/60386
Log:
m
Text files modified:
sandbox/statistics/detail/assign/boost/assign/auto_size/detail/csv.hpp | 2 +-
sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of.hpp | 2 +-
sandbox/statistics/detail/assign/boost/assign/auto_size/ref_rebind_list_of.hpp | 2 +-
sandbox/statistics/detail/assign/libs/assign/example/ref_list_of.cpp | 11 +----------
sandbox/statistics/detail/assign/libs/assign/src/main.cpp | 6 ++++--
sandbox/statistics/detail/assign/libs/assign/test/Jamfile.v2 | 3 +--
sandbox/statistics/detail/assign/libs/assign/test/ref_list_of.cpp | 16 ++--------------
7 files changed, 11 insertions(+), 31 deletions(-)
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/detail/csv.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/detail/csv.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/detail/csv.hpp 2010-03-09 15:05:06 EST (Tue, 09 Mar 2010)
@@ -48,7 +48,7 @@
boost::assign::detail::auto_size::tag::array \
/**/
#define BOOST_ASSIGN_CSV_RESULT(U,N,P) \
- typename boost::assign::detail::auto_size::policy<P>::template \
+ typename boost::assign::detail::auto_size::csv_policy<P>::template \
apply<U,N,BOOST_ASSIGN_CSV_ref>::type \
/**/
#define BOOST_ASSIGN_CSV_RESULT_DEF_POLICY(U,N) \
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/ref_list_of.hpp 2010-03-09 15:05:06 EST (Tue, 09 Mar 2010)
@@ -25,7 +25,7 @@
template<typename P,typename T>
typename detail::auto_size::first_copy<T,P>::type
- ref_list_of(const T& t){
+ ref_list_of(T& t){
return detail::auto_size::first_copy<T,P>::call(t);
}
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/ref_rebind_list_of.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/ref_rebind_list_of.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/ref_rebind_list_of.hpp 2010-03-09 15:05:06 EST (Tue, 09 Mar 2010)
@@ -25,7 +25,7 @@
template<typename P,typename T>
typename detail::auto_size::first_rebind<T,P>::type
- ref_rebind_list_of(const T& t){
+ ref_rebind_list_of(T& t){
return detail::auto_size::first_rebind<T,P>::call(t);
}
Modified: sandbox/statistics/detail/assign/libs/assign/example/ref_list_of.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/example/ref_list_of.cpp (original)
+++ sandbox/statistics/detail/assign/libs/assign/example/ref_list_of.cpp 2010-03-09 15:05:06 EST (Tue, 09 Mar 2010)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// example::ref_list_of.h //
+// example::ref_list_of.cpp //
// //
// (C) Copyright 2010 Erwann Rogard //
// Use, modification and distribution are subject to the //
@@ -111,15 +111,6 @@
cref_list_of(1)(5)(3)(d)(e)(f)(g)(h) );
BOOST_ASSERT( max == const_max );
}
- {
- int a=a1, b=b1, c=c1, d=d1, e=e1, f=f1;
- BOOST_AUTO(tmp1,ref_rebind_list_of(a)(b)(c));
- BOOST_AUTO(tmp2,ref_rebind_list_of(d)(e)(f));
- tmp1.swap(tmp2);
- BOOST_ASSERT(tmp1[1]==e);
- BOOST_ASSERT(tmp2[1]==b);
-
- }
}
// ---- Copy semantics
{ // As right operand (iterators + array)
Modified: sandbox/statistics/detail/assign/libs/assign/src/main.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/src/main.cpp (original)
+++ sandbox/statistics/detail/assign/libs/assign/src/main.cpp 2010-03-09 15:05:06 EST (Tue, 09 Mar 2010)
@@ -1,13 +1,15 @@
#include <iostream>
#include <libs/assign/example/ref_list_of.h>
-//#include <libs/assign/test/speed.h>
+#include <libs/assign/example/ref_csv.h>
+#include <libs/assign/test/speed.h>
//#include <libs/assign/test/speed2.h>
//#include <libs/assign/test/ref_list_of.h>
int main (int argc, char * const argv[]) {
example_ref_list_of(std::cout);
- //test_speed(std::cout);
+ example_ref_csv(std::cout);
+ test_speed(std::cout);
//test_speed2(std::cout);
//check_ref_list_of();
Modified: sandbox/statistics/detail/assign/libs/assign/test/Jamfile.v2
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/test/Jamfile.v2 (original)
+++ sandbox/statistics/detail/assign/libs/assign/test/Jamfile.v2 2010-03-09 15:05:06 EST (Tue, 09 Mar 2010)
@@ -21,8 +21,7 @@
[ assign-test list_of ]
[ assign-test ptr_list_of ]
[ assign-test static_list_of ]
- [ assign-test static_list_of_auto_size ]
- [ assign-test static_list_of_auto_size_csv ]
+ [ assign-test ref_list_of ]
[ assign-test tuple_list_of ]
[ assign-test list_inserter ]
[ assign-test ptr_list_inserter ]
Modified: sandbox/statistics/detail/assign/libs/assign/test/ref_list_of.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/test/ref_list_of.cpp (original)
+++ sandbox/statistics/detail/assign/libs/assign/test/ref_list_of.cpp 2010-03-09 15:05:06 EST (Tue, 09 Mar 2010)
@@ -6,10 +6,7 @@
// 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_TEST_REF_LIST_OF_ER_2010_HPP
-#define LIBS_ASSIGN_TEST_REF_LIST_OF_ER_2010_HPP
#include <boost/detail/workaround.hpp>
-#include <libs/assign/test/ref_list_of.h>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // supress warning in Boost.Test
@@ -26,7 +23,7 @@
#include <boost/typeof/typeof.hpp>
#include <boost/array.hpp>
#include <boost/range.hpp>
-//#include <boost/range/chain.hpp>//Uncomment when in release
+//#include <boost/range/chain.hpp>
#include <boost/assign/auto_size/ref_list_of.hpp>
#include <boost/assign/auto_size/ref_rebind_list_of.hpp>
#include <boost/test/test_tools.hpp>
@@ -105,15 +102,6 @@
cref_list_of(1)(5)(3)(d)(e)(f)(g)(h) );
BOOST_CHECK_EQUAL( max == const_max );
}
- {
- int a=a1, b=b1, c=c1, d=d1, e=e1, f=f1;
- BOOST_AUTO(tmp1,ref_rebind_list_of(a)(b)(c));
- BOOST_AUTO(tmp2,ref_rebind_list_of(d)(e)(f));
- tmp1.swap(tmp2);
- BOOST_CHECK_EQUAL(tmp1[1]==e);
- BOOST_CHECK_EQUAL(tmp2[1]==b);
-
- }
}
// ---- Copy semantics
{ // As right operand (iterators + array)
@@ -207,7 +195,7 @@
int a=a1, b=b1, c=c1;
BOOST_CHECK_EQUAL(boost::size(cref_list_of(a)(b)(c).range(array))==7u);
- // Uncomment when range_ex is in the release
+ // TODO:
//BOOST_CHECK_EQUAL(
// boost::size(
// boost::chain(
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