Subject: [Boost-commit] svn:boost r68245 - in sandbox/statistics/support/libs/assign/v2: src test/detail test/detail/traits test/ref
From: erwann.rogard_at_[hidden]
Date: 2011-01-18 14:31:38
Author: e_r
Date: 2011-01-18 14:31:33 EST (Tue, 18 Jan 2011)
New Revision: 68245
URL: http://svn.boost.org/trac/boost/changeset/68245
Log:
upd boost/assign/v2
Text files modified:
sandbox/statistics/support/libs/assign/v2/src/main.cpp | 9 +++++-
sandbox/statistics/support/libs/assign/v2/test/detail/traits.cpp | 3 -
sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_push.cpp | 15 ++++-------
sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_static_size.cpp | 50 ---------------------------------------
sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_static_size.h | 26 --------------------
sandbox/statistics/support/libs/assign/v2/test/ref/array.cpp | 3 -
sandbox/statistics/support/libs/assign/v2/test/ref/csv_array.cpp | 4 +-
sandbox/statistics/support/libs/assign/v2/test/ref/list_tuple.cpp | 2
8 files changed, 20 insertions(+), 92 deletions(-)
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-18 14:31:33 EST (Tue, 18 Jan 2011)
@@ -1,5 +1,6 @@
#include <iostream>
#include <boost/assert.hpp>
+/*
#include <libs/assign/v2/example/utility.h>
#include <libs/assign/v2/example/ref.h>
#include <libs/assign/v2/example/put.h>
@@ -10,26 +11,30 @@
#include <libs/assign/v2/test/utility/convert.h>
#include <libs/assign/v2/test/utility/chain.h>
+*/
-#include <libs/assign/v2/test/ref/csv_array.h>
-
int main (int argc, char * const argv[])
{
// Do not put libs/assign/v2/test/unit_testing in this project
{
+/*
using namespace test_assign_v2;
xxx_detail::test();
xxx_utility::xxx_chain::test();
xxx_put::test();
xxx_ref::test();
+*/
}
{
+/*
using namespace example_assign_v2;
+
xxx_ref::run(std::cout);
xxx_put::run(std::cout);
xxx_utility::run(std::cout);
+*/
}
return 0;
Modified: sandbox/statistics/support/libs/assign/v2/test/detail/traits.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/detail/traits.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/detail/traits.cpp 2011-01-18 14:31:33 EST (Tue, 18 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/detail/traits.hpp> // ensure parses
#include <libs/assign/v2/test/detail/traits/has_push.h>
-#include <libs/assign/v2/test/detail/traits/has_static_size.h>
#include <libs/assign/v2/test/detail/traits/has_value_type.h>
#include <libs/assign/v2/test/detail/traits.h>
@@ -18,7 +18,6 @@
void test(){
xxx_has_push::test();
- xxx_has_static_size::test();
xxx_has_value_type::test();
}
Modified: sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_push.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_push.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_push.cpp 2011-01-18 14:31:33 EST (Tue, 18 Jan 2011)
@@ -10,7 +10,7 @@
#include <vector>
#include <stack>
#include <queue>
-#include <boost/static_assert.hpp>
+#include <boost/mpl/assert.hpp>
#include <boost/assign/v2/detail/traits/container/has_push.hpp>
#include <libs/assign/v2/test/detail/traits/has_push.h>
@@ -25,18 +25,15 @@
namespace ns = as2::container_traits;
{
typedef std::queue<int> v_;
- typedef ns::has_push<v_> has_push_;
- BOOST_STATIC_ASSERT( has_push_::value );
+ BOOST_MPL_ASSERT(( ns::has_push<v_> ));
}
{
- typedef std::stack<int> v_;
- typedef ns::has_push<v_> has_push_;
- BOOST_STATIC_ASSERT( has_push_::value );
+ typedef std::queue<int> v_;
+ BOOST_MPL_ASSERT(( ns::has_push<v_> ));
}
{
- typedef std::vector<int> v_;
- typedef ns::has_push<v_> has_push_;
- BOOST_STATIC_ASSERT( !has_push_::value );
+ typedef std::vector<int> v_;
+ BOOST_MPL_ASSERT_NOT(( ns::has_push<v_> ));
}
}
Modified: sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_static_size.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_static_size.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_static_size.cpp 2011-01-18 14:31:33 EST (Tue, 18 Jan 2011)
@@ -1,49 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// 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) //
-//////////////////////////////////////////////////////////////////////////////
-#include <cstddef>
-#include <boost/array.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/assign/v2/detail/traits/container/has_static_size.hpp>
-#include <boost/assign/v2/ref/array/functor.hpp>
-#include <libs/assign/v2/test/detail/traits/has_static_size.h>
-
-struct my_cont{
- typedef std::size_t size_type;
-};
-
-namespace test_assign_v2{
-namespace xxx_detail{
-namespace xxx_traits{
-namespace xxx_has_static_size{
-
- void test()
- {
- namespace as2 = boost::assign::v2;
- {
- typedef boost::array<int,1> cont_;
- typedef as2::container_traits::has_static_size<cont_> pred_;
- BOOST_STATIC_ASSERT( pred_::value );
- }
- {
- typedef as2::ref::result_of::empty_array<int>::type cont_;
- typedef as2::container_traits::has_static_size<cont_> pred_;
- BOOST_STATIC_ASSERT( pred_::value );
- }
- {
- typedef my_cont cont_;
- typedef as2::container_traits::has_static_size<cont_> pred_;
- BOOST_STATIC_ASSERT( !pred_::value );
- }
- }
-
-}// xxx_has_static_size
-}// xxx_traits
-}// xxx_detail
-}// test_assign_v2
+// TODO remove file
\ No newline at end of file
Modified: sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_static_size.h
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_static_size.h (original)
+++ sandbox/statistics/support/libs/assign/v2/test/detail/traits/has_static_size.h 2011-01-18 14:31:33 EST (Tue, 18 Jan 2011)
@@ -1,25 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// 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 LIBS_ASSIGN_V2_TEST_DETAIL_TRAITS_HAS_STATIC_SIZE_ER_2010_H
-#define LIBS_ASSIGN_V2_TEST_DETAIL_TRAITS_HAS_STATIC_SIZE_ER_2010_H
-
-namespace test_assign_v2{
-namespace xxx_detail{
-namespace xxx_traits{
-namespace xxx_has_static_size{
-
- void test();
-
-}// xxx_has_static_size
-}// xxx_detail
-}// xxx_traits
-}// test_assign
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/statistics/support/libs/assign/v2/test/ref/array.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/ref/array.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/ref/array.cpp 2011-01-18 14:31:33 EST (Tue, 18 Jan 2011)
@@ -22,7 +22,6 @@
#include <boost/assign/v2/detail/checking/check.hpp>
#include <boost/assign/v2/detail/checking/constants.hpp>
#include <boost/assign/v2/detail/checking/container.hpp>
-#include <boost/assign/v2/detail/checking/array.hpp>
#include <boost/assign/v2/ref/array/functor.hpp>
#include <boost/assign/v2/ref/wrapper.hpp>
#include <libs/assign/v2/test/ref/array.h>
@@ -41,7 +40,7 @@
ar_ ar = as2::ref::array( a )( b )( c )( d )( e )( f )( g )( h );
{
- typedef as2::container_tag::static_array tag_;
+ typedef as2::container_tag::array tag_;
namespace ns = as2::checking::container;
as2::checking::do_check(tag_(), ar );
}
Modified: sandbox/statistics/support/libs/assign/v2/test/ref/csv_array.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/ref/csv_array.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/ref/csv_array.cpp 2011-01-18 14:31:33 EST (Tue, 18 Jan 2011)
@@ -35,7 +35,7 @@
using namespace as2::checking::constants;
ar_ ar = as2::ref::csv_array( a , b , c , d , e , f , g , h );
{
- typedef as2::container_tag::static_array tag_;
+ typedef as2::container_tag::array tag_;
as2::checking::do_check(tag_(), ar );
}
{
@@ -71,7 +71,7 @@
)
);
{
- typedef as2::container_tag::static_array tag_;
+ typedef as2::container_tag::array tag_;
as2::checking::do_check(
tag_(),
as2::ref::csv_array<int const>(
Modified: sandbox/statistics/support/libs/assign/v2/test/ref/list_tuple.cpp
==============================================================================
--- sandbox/statistics/support/libs/assign/v2/test/ref/list_tuple.cpp (original)
+++ sandbox/statistics/support/libs/assign/v2/test/ref/list_tuple.cpp 2011-01-18 14:31:33 EST (Tue, 18 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 <iostream>
#include <assert.h>
+#include <string>
#include <boost/mpl/vector/vector0.hpp>
#include <boost/mpl/vector/vector10.hpp>
#include <boost/assign/v2/ref/list_tuple.hpp>