|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r83251 - in sandbox/type_erasure: boost/type_erasure boost/type_erasure/detail libs/type_erasure/doc libs/type_erasure/example libs/type_erasure/test
From: steven_at_[hidden]
Date: 2013-03-02 14:23:47
Author: steven_watanabe
Date: 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
New Revision: 83251
URL: http://svn.boost.org/trac/boost/changeset/83251
Log:
Rename relaxed_match -> relaxed.
Added:
sandbox/type_erasure/boost/type_erasure/relaxed.hpp
- copied, changed from r83171, /sandbox/type_erasure/boost/type_erasure/relaxed_match.hpp
sandbox/type_erasure/libs/type_erasure/test/test_relaxed.cpp
- copied, changed from r83171, /sandbox/type_erasure/libs/type_erasure/test/test_relaxed_match.cpp
Removed:
sandbox/type_erasure/boost/type_erasure/relaxed_match.hpp
sandbox/type_erasure/libs/type_erasure/test/test_relaxed_match.cpp
Text files modified:
sandbox/type_erasure/boost/type_erasure/any.hpp | 24 ++++++++++++------------
sandbox/type_erasure/boost/type_erasure/binding.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/call.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/check_match.hpp | 6 +++---
sandbox/type_erasure/boost/type_erasure/detail/normalize.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/operators.hpp | 3 +--
sandbox/type_erasure/boost/type_erasure/relaxed.hpp | 10 +++++-----
sandbox/type_erasure/boost/type_erasure/require_match.hpp | 4 ++--
sandbox/type_erasure/libs/type_erasure/doc/type_erasure.qbk | 2 +-
sandbox/type_erasure/libs/type_erasure/example/basic.cpp | 6 +++---
sandbox/type_erasure/libs/type_erasure/example/references.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/Jamfile.jam | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_assign.cpp | 24 ++++++++++++------------
sandbox/type_erasure/libs/type_erasure/test/test_construct_cref.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_construct_ref.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_equal.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_forward_iterator.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_is_empty.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_less.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_nested.cpp | 4 ++--
sandbox/type_erasure/libs/type_erasure/test/test_null.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_relaxed.cpp | 4 ++--
22 files changed, 55 insertions(+), 56 deletions(-)
Modified: sandbox/type_erasure/boost/type_erasure/any.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/any.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/any.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -41,7 +41,7 @@
#include <boost/type_erasure/static_binding.hpp>
#include <boost/type_erasure/concept_interface.hpp>
#include <boost/type_erasure/call.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/type_erasure/param.hpp>
namespace boost {
@@ -145,7 +145,7 @@
/**
* Constructs a null @ref any.
*
- * \pre @ref relaxed_match must be in @c Concept.
+ * \pre @ref relaxed must be in @c Concept.
*
* \throws Nothing.
*/
@@ -649,7 +649,7 @@
* Assigns to an @ref any.
*
* If an appropriate overload of @ref assignable is not available
- * and @ref relaxed_match is in @c Concept, falls back on
+ * and @ref relaxed is in @c Concept, falls back on
* constructing from @c other.
*
* \throws Whatever the assignment operator of the contained
@@ -670,7 +670,7 @@
* Assigns to an @ref any.
*
* If an appropriate overload of @ref assignable is not available
- * and @ref relaxed_match is in @c Concept, falls back on
+ * and @ref relaxed is in @c Concept, falls back on
* constructing from @c other.
*
* \throws Whatever the assignment operator of the contained
@@ -1119,7 +1119,7 @@
* Assigns to an @ref any.
*
* If an appropriate overload of @ref assignable is not available
- * and @ref relaxed_match is in @c Concept, falls back on
+ * and @ref relaxed is in @c Concept, falls back on
* constructing from @c other.
*
* \throws Whatever the assignment operator of the contained
@@ -1139,7 +1139,7 @@
* Assigns to an @ref any.
*
* If an appropriate overload of @ref assignable is not available
- * and @ref relaxed_match is in @c Concept, falls back on
+ * and @ref relaxed is in @c Concept, falls back on
* constructing from @c other.
*
* \throws Whatever the assignment operator of the contained
@@ -1160,7 +1160,7 @@
* Assigns to an @ref any.
*
* If an appropriate overload of @ref assignable is not available
- * and @ref relaxed_match is in @c Concept, falls back on
+ * and @ref relaxed is in @c Concept, falls back on
* constructing from @c other.
*
* \throws Whatever the assignment operator of the contained
@@ -1423,7 +1423,7 @@
/**
* Assigns to an @ref any.
*
- * \pre @ref relaxed_match is in @c Concept.
+ * \pre @ref relaxed is in @c Concept.
*
* \throws Nothing.
*/
@@ -1437,7 +1437,7 @@
/**
* Assigns to an @ref any.
*
- * \pre @ref relaxed_match is in @c Concept.
+ * \pre @ref relaxed is in @c Concept.
*
* \throws std::bad_alloc. Provides the strong exception guarantee.
*/
@@ -1735,7 +1735,7 @@
* Assigns to an @ref any.
*
* If an appropriate overload of @ref assignable is not available
- * and @ref relaxed_match is in @c Concept, falls back on
+ * and @ref relaxed is in @c Concept, falls back on
* constructing from @c other.
*
* \throws Whatever the assignment operator of the contained
@@ -1755,7 +1755,7 @@
* Assigns to an @ref any.
*
* If an appropriate overload of @ref assignable is not available
- * and @ref relaxed_match is in @c Concept, falls back on
+ * and @ref relaxed is in @c Concept, falls back on
* constructing from @c other.
*
* \throws Whatever the assignment operator of the contained
@@ -1776,7 +1776,7 @@
* Assigns to an @ref any.
*
* If an appropriate overload of @ref assignable is not available
- * and @ref relaxed_match is in @c Concept, falls back on
+ * and @ref relaxed is in @c Concept, falls back on
* constructing from @c other.
*
* \throws Whatever the assignment operator of the contained
Modified: sandbox/type_erasure/boost/type_erasure/binding.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/binding.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/binding.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -78,7 +78,7 @@
public:
/**
- * \pre @ref relaxed_match must be in @c Concept.
+ * \pre @ref relaxed must be in @c Concept.
*
* \throws Nothing.
*/
Modified: sandbox/type_erasure/boost/type_erasure/call.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/call.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/call.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -164,7 +164,7 @@
* result will be converted to the appropriate @ref
* any type.
*
- * \throws bad_function_call if @ref relaxed_match is
+ * \throws bad_function_call if @ref relaxed is
* in @c Concept and there is a type mismatch.
*
* Example:
Modified: sandbox/type_erasure/boost/type_erasure/check_match.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/check_match.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/check_match.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -27,7 +27,7 @@
#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
#include <boost/type_erasure/detail/extract_concept.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/type_erasure/detail/access.hpp>
namespace boost {
@@ -73,9 +73,9 @@
#ifdef BOOST_TYPE_ERASURE_DOXYGEN
/**
- * If @ref relaxed_match is in @c Concept, checks whether the
+ * If @ref relaxed is in @c Concept, checks whether the
* arguments to @c f match the types specified by
- * @c binding. If @ref relaxed_match is not in @c Concept,
+ * @c binding. If @ref relaxed is not in @c Concept,
* returns true. If @c binding is not specified, it will
* be deduced from the arguments.
*/
Modified: sandbox/type_erasure/boost/type_erasure/detail/normalize.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/detail/normalize.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/detail/normalize.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -30,7 +30,7 @@
#include <boost/type_erasure/detail/get_placeholders.hpp>
#include <boost/type_erasure/detail/rebind_placeholders.hpp>
#include <boost/type_erasure/detail/normalize_deduced.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/type_erasure/builtin.hpp>
namespace boost {
Modified: sandbox/type_erasure/boost/type_erasure/operators.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/operators.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/operators.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -21,9 +21,8 @@
#include <boost/type_erasure/derived.hpp>
#include <boost/type_erasure/rebind_any.hpp>
#include <boost/type_erasure/param.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
#include <boost/type_erasure/check_match.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/type_erasure/typeid_of.hpp>
namespace boost {
Copied: sandbox/type_erasure/boost/type_erasure/relaxed.hpp (from r83171, /sandbox/type_erasure/boost/type_erasure/relaxed_match.hpp)
==============================================================================
--- /sandbox/type_erasure/boost/type_erasure/relaxed_match.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/relaxed.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -8,8 +8,8 @@
//
// $Id$
-#ifndef BOOST_TYPE_ERASURE_RELAXED_MATCH_HPP_INCLUDED
-#define BOOST_TYPE_ERASURE_RELAXED_MATCH_HPP_INCLUDED
+#ifndef BOOST_TYPE_ERASURE_RELAXED_HPP_INCLUDED
+#define BOOST_TYPE_ERASURE_RELAXED_HPP_INCLUDED
#include <boost/mpl/vector.hpp>
#include <boost/mpl/bool.hpp>
@@ -62,11 +62,11 @@
* match, the ordering will be according to
* @c std::type_info::before.
*/
-struct relaxed_match : ::boost::mpl::vector0<> {};
+struct relaxed : ::boost::mpl::vector0<> {};
/**
* A metafunction indicating whether @c Concept
- * includes @ref relaxed_match.
+ * includes @ref relaxed.
*/
template<class Concept>
struct is_relaxed :
@@ -78,7 +78,7 @@
/** INTERNAL ONLY */
template<>
-struct is_relaxed< ::boost::type_erasure::relaxed_match> :
+struct is_relaxed< ::boost::type_erasure::relaxed> :
::boost::mpl::true_
{};
Deleted: sandbox/type_erasure/boost/type_erasure/relaxed_match.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/relaxed_match.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
+++ (empty file)
@@ -1,88 +0,0 @@
-// Boost.TypeErasure library
-//
-// Copyright 2011 Steven Watanabe
-//
-// Distributed under 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)
-//
-// $Id$
-
-#ifndef BOOST_TYPE_ERASURE_RELAXED_MATCH_HPP_INCLUDED
-#define BOOST_TYPE_ERASURE_RELAXED_MATCH_HPP_INCLUDED
-
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/is_sequence.hpp>
-#include <boost/mpl/find_if.hpp>
-#include <boost/mpl/not.hpp>
-#include <boost/mpl/end.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-namespace boost {
-namespace type_erasure {
-
-template<class T>
-struct is_relaxed;
-
-namespace detail {
-
-template<class T>
-struct is_relaxed_impl :
- ::boost::mpl::not_<
- typename ::boost::is_same<
- typename ::boost::mpl::find_if<
- T,
- ::boost::type_erasure::is_relaxed< ::boost::mpl::_1>
- >::type,
- typename ::boost::mpl::end<T>::type
- >::type
- >::type
-{};
-
-}
-
-/**
- * This special concept does not have any behavior by
- * itself. However it affects the behavior of other
- * concepts. In the presence of this concept, the
- * requirement that all the arguments to a function
- * must match is relaxed. Instead, if there is a
- * reasonable default implementation, it will be used,
- * otherwise a @ref bad_function_call exception will
- * be thrown.
- *
- * The following concepts have special behavior with
- * this flag:
- * - @ref assignable "assignable": If the types are not the same,
- * it will fall back on copy and swap.
- * - @ref equality_comparable "equality_comparable": If the types do not
- * match, it will return false.
- * - @ref less_than_comparable "less_than_comparable": If the types do not
- * match, the ordering will be according to
- * @c std::type_info::before.
- */
-struct relaxed_match : ::boost::mpl::vector0<> {};
-
-/**
- * A metafunction indicating whether @c Concept
- * includes @ref relaxed_match.
- */
-template<class Concept>
-struct is_relaxed :
- ::boost::mpl::eval_if< ::boost::mpl::is_sequence<Concept>,
- ::boost::type_erasure::detail::is_relaxed_impl<Concept>,
- ::boost::mpl::false_
- >::type
-{};
-
-/** INTERNAL ONLY */
-template<>
-struct is_relaxed< ::boost::type_erasure::relaxed_match> :
- ::boost::mpl::true_
-{};
-
-}
-}
-
-#endif
Modified: sandbox/type_erasure/boost/type_erasure/require_match.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/require_match.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/require_match.hpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -25,7 +25,7 @@
#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
#include <boost/type_erasure/detail/extract_concept.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/type_erasure/check_match.hpp>
#include <boost/type_erasure/exception.hpp>
@@ -41,7 +41,7 @@
* Checks that the actual types stored in all the @ref any
* arguments match the types specified by @c binding. If
* they do not match then,
- * - If @ref relaxed_match is in @c Concept, throws @ref bad_function_call.
+ * - If @ref relaxed is in @c Concept, throws @ref bad_function_call.
* - Otherwise the behavior is undefined.
*
* If @c binding is not specified, it will be deduced from
Modified: sandbox/type_erasure/libs/type_erasure/doc/type_erasure.qbk
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/doc/type_erasure.qbk (original)
+++ sandbox/type_erasure/libs/type_erasure/doc/type_erasure.qbk 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -21,7 +21,7 @@
[def __copy_constructible [classref boost::type_erasure::copy_constructible copy_constructible]]
[def __assignable [classref boost::type_erasure::assignable assignable]]
[def __typeid_ [classref boost::type_erasure::typeid_ typeid_]]
-[def __relaxed_match [classref boost::type_erasure::relaxed_match relaxed_match]]
+[def __relaxed [classref boost::type_erasure::relaxed relaxed]]
[def __binding [classref boost::type_erasure::binding binding]]
[def __static_binding [classref boost::type_erasure::static_binding static_binding]]
[def __placeholder [classref boost::type_erasure::placeholder placeholder]]
Modified: sandbox/type_erasure/libs/type_erasure/example/basic.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/example/basic.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/example/basic.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -31,13 +31,13 @@
In the rare case when we only want a single concept, it doesn't
need to be wrapped in an MPL sequence.]
*/
- any<mpl::vector<copy_constructible<>, typeid_<>, relaxed_match> > x(10);
+ any<mpl::vector<copy_constructible<>, typeid_<>, relaxed> > x(10);
int i = any_cast<int>(x); // i == 10
/*`
__copy_constructible is a builtin concept that allows us to
copy and destroy the object. __typeid_ provides run-time
- type information so that we can use __any_cast. __relaxed_match
- enables various useful defaults. Without __relaxed_match,
+ type information so that we can use __any_cast. __relaxed
+ enables various useful defaults. Without __relaxed,
__any supports /exactly/ what you specify and nothing else.
In particular, it allows default construction and assignment of __any.
*/
Modified: sandbox/type_erasure/libs/type_erasure/example/references.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/example/references.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/example/references.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -82,7 +82,7 @@
typedef mpl::vector<
copy_constructible<>,
incrementable<>,
- relaxed_match
+ relaxed
> requirements;
any<requirements> x(10);
any<requirements, _self&> y(x);
Modified: sandbox/type_erasure/libs/type_erasure/test/Jamfile.jam
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/Jamfile.jam (original)
+++ sandbox/type_erasure/libs/type_erasure/test/Jamfile.jam 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -15,7 +15,7 @@
run test_callable.cpp /boost//unit_test_framework ;
run test_reference.cpp /boost//unit_test_framework ;
run test_construct.cpp /boost//unit_test_framework ;
-run test_relaxed_match.cpp /boost//unit_test_framework ;
+run test_relaxed.cpp /boost//unit_test_framework ;
run test_assign.cpp /boost//unit_test_framework ;
run test_construct_ref.cpp /boost//unit_test_framework ;
run test_construct_cref.cpp /boost//unit_test_framework ;
Modified: sandbox/type_erasure/libs/type_erasure/test/test_assign.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_assign.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_assign.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -13,7 +13,7 @@
#include <boost/type_erasure/builtin.hpp>
#include <boost/type_erasure/operators.hpp>
#include <boost/type_erasure/any_cast.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/mpl/vector.hpp>
#define BOOST_TEST_MAIN
@@ -42,7 +42,7 @@
BOOST_AUTO_TEST_CASE(test_basic_relaxed)
{
- typedef ::boost::mpl::vector<common<>, assignable<>, relaxed_match > test_concept;
+ typedef ::boost::mpl::vector<common<>, assignable<>, relaxed > test_concept;
any<test_concept> x(1);
int* ip = any_cast<int*>(&x);
any<test_concept> y(2);
@@ -59,7 +59,7 @@
destructible<>,
typeid_<>,
assignable<>,
- relaxed_match
+ relaxed
> test_concept;
any<test_concept> x(1);
int* ip = any_cast<int*>(&x);
@@ -75,7 +75,7 @@
{
typedef ::boost::mpl::vector<
common<>,
- relaxed_match
+ relaxed
> test_concept;
any<test_concept> x(1);
any<test_concept> y(2);
@@ -85,7 +85,7 @@
BOOST_AUTO_TEST_CASE(test_dynamic_fallback)
{
- typedef ::boost::mpl::vector<common<>, assignable<>, relaxed_match> test_concept;
+ typedef ::boost::mpl::vector<common<>, assignable<>, relaxed> test_concept;
any<test_concept> x(1);
any<test_concept> y(2.0);
x = y;
@@ -94,7 +94,7 @@
BOOST_AUTO_TEST_CASE(test_dynamic_fail)
{
- typedef ::boost::mpl::vector<destructible<>, typeid_<>, assignable<>, relaxed_match> test_concept;
+ typedef ::boost::mpl::vector<destructible<>, typeid_<>, assignable<>, relaxed> test_concept;
any<test_concept> x(1);
any<test_concept> y(2.0);
BOOST_CHECK_THROW(x = y, bad_function_call);
@@ -114,7 +114,7 @@
BOOST_AUTO_TEST_CASE(test_basic_relaxed_int)
{
- typedef ::boost::mpl::vector<common<>, assignable<_self, int>, relaxed_match > test_concept;
+ typedef ::boost::mpl::vector<common<>, assignable<_self, int>, relaxed > test_concept;
any<test_concept> x(1);
int* ip = any_cast<int*>(&x);
x = 2;
@@ -130,7 +130,7 @@
destructible<>,
typeid_<>,
assignable<_self, int>,
- relaxed_match
+ relaxed
> test_concept;
any<test_concept> x(1);
int* ip = any_cast<int*>(&x);
@@ -145,7 +145,7 @@
{
typedef ::boost::mpl::vector<
common<>,
- relaxed_match
+ relaxed
> test_concept;
any<test_concept> x(1);
x = 2;
@@ -164,7 +164,7 @@
BOOST_AUTO_TEST_CASE(test_basic_relaxed_ref)
{
- typedef ::boost::mpl::vector<common<>, assignable<>, relaxed_match > test_concept;
+ typedef ::boost::mpl::vector<common<>, assignable<>, relaxed > test_concept;
int i = 1;
any<test_concept, _self&> x(i);
any<test_concept> y(2);
@@ -176,7 +176,7 @@
{
typedef ::boost::mpl::vector<
common<>,
- relaxed_match
+ relaxed
> test_concept;
int i = 1;
any<test_concept, _self&> x(i);
@@ -188,7 +188,7 @@
BOOST_AUTO_TEST_CASE(test_dynamic_fallback_ref)
{
- typedef ::boost::mpl::vector<common<>, assignable<>, relaxed_match> test_concept;
+ typedef ::boost::mpl::vector<common<>, assignable<>, relaxed> test_concept;
int i = 1;
any<test_concept, _self&> x(i);
any<test_concept> y(2.0);
Modified: sandbox/type_erasure/libs/type_erasure/test/test_construct_cref.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_construct_cref.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_construct_cref.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -12,7 +12,7 @@
#include <boost/type_erasure/builtin.hpp>
#include <boost/type_erasure/operators.hpp>
#include <boost/type_erasure/any_cast.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/mpl/vector.hpp>
#define BOOST_TEST_MAIN
Modified: sandbox/type_erasure/libs/type_erasure/test/test_construct_ref.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_construct_ref.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_construct_ref.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -12,7 +12,7 @@
#include <boost/type_erasure/builtin.hpp>
#include <boost/type_erasure/operators.hpp>
#include <boost/type_erasure/any_cast.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/mpl/vector.hpp>
#define BOOST_TEST_MAIN
Modified: sandbox/type_erasure/libs/type_erasure/test/test_equal.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_equal.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_equal.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -96,7 +96,7 @@
BOOST_AUTO_TEST_CASE(test_relaxed)
{
- typedef boost::mpl::vector<copy_constructible<>, equality_comparable<>, relaxed_match> test_concept;
+ typedef boost::mpl::vector<copy_constructible<>, equality_comparable<>, relaxed> test_concept;
any<test_concept> x(1);
any<test_concept> y(2);
any<test_concept> z(std::string("test"));
Modified: sandbox/type_erasure/libs/type_erasure/test/test_forward_iterator.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_forward_iterator.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_forward_iterator.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -77,7 +77,7 @@
typedef boost::mpl::vector<
forward_iterator<>,
same_type<forward_iterator<>::value_type, int>,
- relaxed_match
+ relaxed
> test_concept;
std::vector<int> vec(10);
any<test_concept> x(vec.begin());
Modified: sandbox/type_erasure/libs/type_erasure/test/test_is_empty.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_is_empty.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_is_empty.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -27,7 +27,7 @@
BOOST_AUTO_TEST_CASE(test_relaxed)
{
- typedef boost::mpl::vector<copy_constructible<>, relaxed_match> test_concept;
+ typedef boost::mpl::vector<copy_constructible<>, relaxed> test_concept;
any<test_concept> x(2);
BOOST_CHECK(!is_empty(x));
any<test_concept> y;
Modified: sandbox/type_erasure/libs/type_erasure/test/test_less.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_less.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_less.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -158,7 +158,7 @@
BOOST_AUTO_TEST_CASE(test_relaxed)
{
- typedef boost::mpl::vector<copy_constructible<>, less_than_comparable<>, relaxed_match> test_concept;
+ typedef boost::mpl::vector<copy_constructible<>, less_than_comparable<>, relaxed> test_concept;
any<test_concept> x(1);
any<test_concept> y(2);
any<test_concept> z(std::string("test"));
Modified: sandbox/type_erasure/libs/type_erasure/test/test_nested.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_nested.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_nested.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -50,8 +50,8 @@
BOOST_AUTO_TEST_CASE(test_relaxed)
{
- typedef boost::mpl::vector<common<_a>, addable<_a, any1_type>, relaxed_match> test_concept;
- typedef boost::mpl::vector<common<_b>, addable<_b, any1_type>, relaxed_match> dest_concept;
+ typedef boost::mpl::vector<common<_a>, addable<_a, any1_type>, relaxed> test_concept;
+ typedef boost::mpl::vector<common<_b>, addable<_b, any1_type>, relaxed> dest_concept;
any1_type a1(1);
test_class v = { 2 };
any<test_concept, _a> x(v);
Modified: sandbox/type_erasure/libs/type_erasure/test/test_null.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_null.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_null.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -23,7 +23,7 @@
template<class T = _self>
struct common : ::boost::mpl::vector<
copy_constructible<T>,
- relaxed_match
+ relaxed
> {};
BOOST_AUTO_TEST_CASE(test_typeid) {
Copied: sandbox/type_erasure/libs/type_erasure/test/test_relaxed.cpp (from r83171, /sandbox/type_erasure/libs/type_erasure/test/test_relaxed_match.cpp)
==============================================================================
--- /sandbox/type_erasure/libs/type_erasure/test/test_relaxed_match.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_relaxed.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
@@ -13,7 +13,7 @@
#include <boost/type_erasure/builtin.hpp>
#include <boost/type_erasure/operators.hpp>
#include <boost/type_erasure/any_cast.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
+#include <boost/type_erasure/relaxed.hpp>
#include <boost/mpl/vector.hpp>
#define BOOST_TEST_MAIN
@@ -29,7 +29,7 @@
BOOST_AUTO_TEST_CASE(test_simple)
{
- typedef ::boost::mpl::vector<copy_constructible<>, addable<>, relaxed_match> src_concept;
+ typedef ::boost::mpl::vector<copy_constructible<>, addable<>, relaxed> src_concept;
any<src_concept> x(1);
any<src_concept> y(2.0);
BOOST_CHECK_THROW(x + y, bad_function_call);
Deleted: sandbox/type_erasure/libs/type_erasure/test/test_relaxed_match.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_relaxed_match.cpp 2013-03-02 14:23:44 EST (Sat, 02 Mar 2013)
+++ (empty file)
@@ -1,36 +0,0 @@
-// Boost.TypeErasure library
-//
-// Copyright 2011 Steven Watanabe
-//
-// Distributed under 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)
-//
-// $Id$
-
-#include <boost/type_erasure/any.hpp>
-#include <boost/type_erasure/tuple.hpp>
-#include <boost/type_erasure/builtin.hpp>
-#include <boost/type_erasure/operators.hpp>
-#include <boost/type_erasure/any_cast.hpp>
-#include <boost/type_erasure/relaxed_match.hpp>
-#include <boost/mpl/vector.hpp>
-
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
-
-using namespace boost::type_erasure;
-
-template<class T = _self>
-struct common : ::boost::mpl::vector<
- copy_constructible<T>,
- typeid_<T>
-> {};
-
-BOOST_AUTO_TEST_CASE(test_simple)
-{
- typedef ::boost::mpl::vector<copy_constructible<>, addable<>, relaxed_match> src_concept;
- any<src_concept> x(1);
- any<src_concept> y(2.0);
- BOOST_CHECK_THROW(x + y, bad_function_call);
-}
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