LessThan
+min, max,
+min_element,
+max_element,
+LessThan
Comparable,
-sort,
-nth_element
+sort,
+nth_element
.
Last modified 2012-12-10
diff --git a/string/doc/external_concepts.html b/string/doc/external_concepts.html
index af403be..679573f 100644
--- a/string/doc/external_concepts.html
+++ b/string/doc/external_concepts.html
@@ -31,7 +31,7 @@
typedef implementation defined foo_type;The corresponding external concept is the ExternalFooConcept.
A type T fullfills the ExternalFooConcept if these
free-standing functions and type-generators exists:
void foo( const T&, int );
int bar( T& );
- foo_type_of< T >::type;
Literature
© Thorsten Ottosen 2003-2004 (nesotto_AT_cs.auc.dk).
+ foo_type_of< T >::type;
Literature
© Thorsten Ottosen 2003-2004 (nesotto_AT_cs.auc.dk).
Use, modification and distribution is 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)
diff --git a/string/test/split_test.cpp b/string/test/split_test.cpp
index 582472b..3dbcfac 100644
--- a/string/test/split_test.cpp
+++ b/string/test/split_test.cpp
@@ -7,6 +7,8 @@
// See http://www.boost.org for updates, documentation, and revision history.
+#include
+
#include
#include
// equals predicate is used for result comparison
@@ -82,6 +84,28 @@ void iterator_test()
string("xx") );
deep_compare( tokens, vtokens );
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+ // If using a compiler that supports forwarding references, we should be able to use rvalues, too
+ find_all(
+ tokens,
+ string("xx-abc--xx-abb"),
+ "xx" );
+
+ BOOST_REQUIRE( tokens.size()==2 );
+ BOOST_CHECK( tokens[0]==string("xx") );
+ BOOST_CHECK( tokens[1]==string("xx") );
+
+ ifind_all(
+ tokens,
+ string("Xx-abc--xX-abb-xx"),
+ "xx" );
+
+ BOOST_REQUIRE( tokens.size()==3 );
+ BOOST_CHECK( tokens[0]==string("Xx") );
+ BOOST_CHECK( tokens[1]==string("xX") );
+ BOOST_CHECK( tokens[2]==string("xx") );
+#endif
+
// split tests
split(
tokens,
@@ -144,6 +168,21 @@ void iterator_test()
BOOST_REQUIRE( tokens.size()==1 );
BOOST_CHECK( tokens[0]==string("") );
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+ // If using a compiler that supports forwarding references, we should be able to use rvalues, too
+ split(
+ tokens,
+ string("Xx-abc--xX-abb-xx"),
+ is_any_of("xX"),
+ token_compress_on );
+
+ BOOST_REQUIRE( tokens.size()==4 );
+ BOOST_CHECK( tokens[0]==string("") );
+ BOOST_CHECK( tokens[1]==string("-abc--") );
+ BOOST_CHECK( tokens[2]==string("-abb-") );
+ BOOST_CHECK( tokens[3]==string("") );
+#endif
+
find_iterator fiter=make_find_iterator(str1, first_finder("xx"));
find_iterator fiter2;
diff --git a/test/apply_permutation_test.cpp b/test/apply_permutation_test.cpp
index 3dbb7e1..94a60ac 100644
--- a/test/apply_permutation_test.cpp
+++ b/test/apply_permutation_test.cpp
@@ -14,19 +14,19 @@
#define BOOST_TEST_MAIN
-#include
+#include
namespace ba = boost::algorithm;
-void test_apply_permutation()
+BOOST_AUTO_TEST_CASE(test_apply_permutation)
{
//Empty
{
std::vector vec, order, result;
ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//1 element
{
@@ -36,7 +36,7 @@ void test_apply_permutation()
result = vec;
ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//2 elements, no changes
{
@@ -46,7 +46,7 @@ void test_apply_permutation()
result = vec;
ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//2 elements, changed
{
@@ -56,7 +56,7 @@ void test_apply_permutation()
result.push_back(2); result.push_back(1);
ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//Multiple elements, no changes
{
@@ -66,7 +66,7 @@ void test_apply_permutation()
result = vec;
ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//Multiple elements, changed
{
@@ -76,7 +76,7 @@ void test_apply_permutation()
result.push_back(5); result.push_back(4); result.push_back(3); result.push_back(2); result.push_back(1);
ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//Just test range interface
{
@@ -86,18 +86,18 @@ void test_apply_permutation()
result = vec;
ba::apply_permutation(vec, order);
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
}
-void test_apply_reverse_permutation()
+BOOST_AUTO_TEST_CASE(test_apply_reverse_permutation)
{
//Empty
{
std::vector vec, order, result;
ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//1 element
{
@@ -107,7 +107,7 @@ void test_apply_reverse_permutation()
result = vec;
ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//2 elements, no changes
{
@@ -117,7 +117,7 @@ void test_apply_reverse_permutation()
result = vec;
ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//2 elements, changed
{
@@ -127,7 +127,7 @@ void test_apply_reverse_permutation()
result.push_back(2); result.push_back(1);
ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//Multiple elements, no changes
{
@@ -137,7 +137,7 @@ void test_apply_reverse_permutation()
result = vec;
ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//Multiple elements, changed
{
@@ -147,7 +147,7 @@ void test_apply_reverse_permutation()
result.push_back(5); result.push_back(4); result.push_back(3); result.push_back(2); result.push_back(1);
ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end());
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
//Just test range interface
{
@@ -157,12 +157,6 @@ void test_apply_reverse_permutation()
result = vec;
ba::apply_reverse_permutation(vec, order);
- BOOST_CHECK(vec == result);
+ BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end());
}
}
-
-BOOST_AUTO_TEST_CASE(test_main)
-{
- test_apply_permutation();
- test_apply_reverse_permutation();
-}