|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69699 - in sandbox/assign_v2/boost/assign/v2/detail: check check/equal_container config
From: erwann.rogard_at_[hidden]
Date: 2011-03-08 11:35:40
Author: e_r
Date: 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
New Revision: 69699
URL: http://svn.boost.org/trac/boost/changeset/69699
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/detail/check/equal_container.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/array.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/deduce.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/fifo.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/lifo.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/pp.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/range.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/sorted.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/check/equal_ref.hpp | 6 +++---
sandbox/assign_v2/boost/assign/v2/detail/check/equal_val.hpp | 4 ++--
sandbox/assign_v2/boost/assign/v2/detail/check/fwd_equal_container.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp | 2 +-
sandbox/assign_v2/boost/assign/v2/detail/config/enable_cpp0x.hpp | 5 +++--
sandbox/assign_v2/boost/assign/v2/detail/config/limit_arity.hpp | 33 +++++++++++++++++----------------
sandbox/assign_v2/boost/assign/v2/detail/config/limit_csv_arity.hpp | 4 +++-
sandbox/assign_v2/boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp | 14 ++++++++------
sandbox/assign_v2/boost/assign/v2/detail/config/tuple_limit_arity.hpp | 19 +------------------
17 files changed, 48 insertions(+), 59 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -41,4 +41,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/array.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/array.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -35,4 +35,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_ARRAY_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/deduce.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/deduce.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/deduce.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -39,7 +39,7 @@
v2::container_traits::is_lifo
>{};
- // TODO remove bec. map is taken care of by sorted
+ // Uncommented bec. map is taken care of by sorted
//template<>
//struct case_<switch_tag::check_container, 2> :
// switch_aux::helper<
@@ -82,4 +82,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_DEDUCE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/fifo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/fifo.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/fifo.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -36,4 +36,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_FIFO_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/lifo.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/lifo.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/lifo.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -38,4 +38,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_LIFO_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/pp.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/pp.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/pp.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -28,4 +28,4 @@
elem_at_ elem_at = boost::make_iterator_range( r );\
/**/
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_PP_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/range.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/range.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/range.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -29,4 +29,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_RANGE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/sorted.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/sorted.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_container/sorted.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -31,4 +31,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_CONTAINER_SORTED_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_ref.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_ref.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_ref.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 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) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_DETAIL_PREDICATE_EQUAL_REF_ER_2010_HPP
-#define BOOST_ASSIGN_V2_DETAIL_PREDICATE_EQUAL_REF_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_REF_ER_2010_HPP
+#define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_REF_ER_2010_HPP
#include <boost/assign/v2/detail/config/check.hpp>
namespace boost{
@@ -31,4 +31,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_REF_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/equal_val.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/equal_val.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/equal_val.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 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) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_DETAIL_PREDICATE_EQUAL_VAL_ER_2010_HPP
-#define BOOST_ASSIGN_V2_DETAIL_PREDICATE_EQUAL_VAL_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_VAL_ER_2010_HPP
+#define BOOST_ASSIGN_V2_DETAIL_CHECK_EQUAL_VAL_ER_2010_HPP
#include <boost/assign/v2/detail/config/check.hpp>
namespace boost{
Modified: sandbox/assign_v2/boost/assign/v2/detail/check/fwd_equal_container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/check/fwd_equal_container.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/check/fwd_equal_container.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -26,4 +26,4 @@
}// assign
}// boost
-#endif
+#endif // BOOST_ASSIGN_V2_DETAIL_CHECK_FWD_EQUAL_CONTAINER_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/check.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -10,7 +10,7 @@
#ifndef BOOST_ASSIGN_V2_CHECK
#include <boost/assert.hpp>
#define BOOST_ASSIGN_V2_CHECK( p ) BOOST_ASSERT( p )
-#endif
+#endif // BOOST_ASSIGN_V2_CHECK
// In the test suite, use, instead:
// #include <boost/test/test_tools.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/detail/config/enable_cpp0x.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/enable_cpp0x.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/enable_cpp0x.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -10,13 +10,14 @@
#ifndef BOOST_ASSIGN_V2_ENABLE_CPP0X
#include <boost/preprocessor/logical/or.hpp>
#include <boost/config.hpp>
+//[enable_cpp0x
#if defined(BOOST_NO_RVALUE_REFERENCES) || defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_0X_HDR_TUPLE)
#define BOOST_ASSIGN_V2_ENABLE_CPP0X 0
#else
#define BOOST_ASSIGN_V2_ENABLE_CPP0X 1
#endif
-#endif
-
+#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
+//]
/*
-- Previously,
Modified: sandbox/assign_v2/boost/assign/v2/detail/config/limit_arity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/limit_arity.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/limit_arity.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -7,27 +7,28 @@
// 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/preprocessor/arithmetic/inc.hpp>
#include <boost/mpl/limits/arity.hpp>
+#include <boost/assign/v2/detail/pp/parameter_list.hpp>
#ifndef BOOST_ASSIGN_V2_LIMIT_ARITY
-#define BOOST_ASSIGN_V2_LIMIT_ARITY BOOST_MPL_LIMIT_METAFUNCTION_ARITY
-#endif
+//[limit_arity
+/*<< n = BOOST_ASSIGN_V2_LIMIT_ARITY
+ Overload | Arity
+ -------------------------------------
+ functor() | 0
+ functor(x[0]) | 1
+ functor(x[0], x[1]) | 2
+ ...
+ functor(x[0], ...., x[n-1]) | n
+>>*/
+#define BOOST_ASSIGN_V2_LIMIT_ARITY BOOST_MPL_LIMIT_METAFUNCTION_ARITY < BOOST_ASSIGN_V2_PARAMETER_LIST_SIZE ? BOOST_ASSIGN_V2_PARAMETER_LIST_SIZE : BOOST_MPL_LIMIT_METAFUNCTION_ARITY
+//]
-#if BOOST_ASSIGN_V2_LIMIT_ARITY_BOUND > BOOST_MPL_LIMIT_METAFUNCTION_ARITY
+#else
+// Meta-function classes associated with functor
+#if BOOST_ASSIGN_V2_LIMIT_ARITY > BOOST_MPL_LIMIT_METAFUNCTION_ARITY
#error
-// This is required for a metafunction class that returns the result type of a
-// functors.
#endif
-// Functors are by default overloaded as follows:
-//
-// n = BOOST_ASSIGN_V2_LIMIT_ARITY
-// Overload | Arity
-// -------------------------------------
-// f() | 0
-// f(x[0]) | 1
-// f(x[0], x[1]) | 2
-// ...
-// f(x[0], ...., x[n-1]) | n
+#endif // BOOST_ASSIGN_V2_LIMIT_ARITY
Modified: sandbox/assign_v2/boost/assign/v2/detail/config/limit_csv_arity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/limit_csv_arity.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/limit_csv_arity.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -9,5 +9,7 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_LIMIT_CSV_ARITY
+//[limit_csv_arity
#define BOOST_ASSIGN_V2_LIMIT_CSV_ARITY 20
-#endif
+//]
+#endif // BOOST_ASSIGN_V2_LIMIT_CSV_ARITY
Modified: sandbox/assign_v2/boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/limit_lvalue_const_arity.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -11,13 +11,15 @@
#include <boost/mpl/limits/arity.hpp>
#ifndef BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY
+//[limit_lvalue_const_arity
+/*<<
+ Maximum arity for which functors are overloaded for any combination of const
+ and non-const lvalues under C++03. Be warned that the number of function
+ overloads increases geometrically with this number.
+*>>/
#define BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY 2
-#endif
-
-// This constant defines the maximum arity for which functors are overloaded
-// for any combination of lvalue and const under C++03 (the restriction does
-// not apply to C++0x). Be warned, therefore, that the number of function
-// overloads increases geometrically with this number.
+//]
+#endif // BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY
#include <boost/assign/v2/detail/config/limit_arity.hpp>
#if BOOST_ASSIGN_V2_LIMIT_LVALUE_CONST_ARITY > BOOST_ASSIGN_V2_LIMIT_ARITY
Modified: sandbox/assign_v2/boost/assign/v2/detail/config/tuple_limit_arity.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/detail/config/tuple_limit_arity.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/detail/config/tuple_limit_arity.hpp 2011-03-08 11:35:36 EST (Tue, 08 Mar 2011)
@@ -1,18 +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 BOOST_ASSIGN_V2_DETAIL_CONFIG_TUPLE_LIMIT_ARITY_ER_2010_HPP
-#define BOOST_ASSIGN_V2_DETAIL_CONFIG_TUPLE_LIMIT_ARITY_ER_2010_HPP
-#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
-#ifndef BOOST_ASSIGN_V2_CPP03_TUPLE_LIMIT_ARITY
-#define BOOST_ASSIGN_V2_CPP03_TUPLE_LIMIT_ARITY 10 // Do not override
-// Source: boost/tuple/detail/tuple_basic.hpp
-#endif // BOOST_ASSIGN_V2_CPP03_TUPLE_LIMIT_ARITY
-
-#endif // BOOST_ASSIGN_V2_DETAIL_CONFIG_TUPLE_LIMIT_ARITY_ER_2010_HPP
+// TODO remove file
\ No newline at end of file
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