diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:05:34 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:06:28 +0900 |
commit | 34bd32e225e2a8a94104489b31c42e5801cc1f4a (patch) | |
tree | d021b579a0c190354819974e1eaf0baa54b551f3 /libs/detail | |
parent | f763a99a501650eff2c60288aa6f10ef916d769e (diff) | |
download | boost-34bd32e225e2a8a94104489b31c42e5801cc1f4a.tar.gz boost-34bd32e225e2a8a94104489b31c42e5801cc1f4a.tar.bz2 boost-34bd32e225e2a8a94104489b31c42e5801cc1f4a.zip |
Imported Upstream version 1.63.0upstream/1.63.0
Change-Id: Iac85556a04b7e58d63ba636dedb0986e3555714a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'libs/detail')
-rw-r--r-- | libs/detail/doc/html/index.html | 2 | ||||
-rw-r--r-- | libs/detail/test/binary_search_test.cpp | 8 | ||||
-rw-r--r-- | libs/detail/test/is_sorted_test.cpp | 19 |
3 files changed, 19 insertions, 10 deletions
diff --git a/libs/detail/doc/html/index.html b/libs/detail/doc/html/index.html index abde42e705..e0b149c244 100644 --- a/libs/detail/doc/html/index.html +++ b/libs/detail/doc/html/index.html @@ -47,7 +47,7 @@ </div> </div> <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr> -<td align="left"><p><small>Last revised: September 21, 2016 at 14:46:51 GMT</small></p></td> +<td align="left"><p><small>Last revised: December 22, 2016 at 12:38:42 GMT</small></p></td> <td align="right"><div class="copyright-footer"></div></td> </tr></table> <hr> diff --git a/libs/detail/test/binary_search_test.cpp b/libs/detail/test/binary_search_test.cpp index c17a8590f2..aeecfc0888 100644 --- a/libs/detail/test/binary_search_test.cpp +++ b/libs/detail/test/binary_search_test.cpp @@ -196,11 +196,12 @@ void test_loop(Sequence& x, Compare cmp, unsigned long test_count) std::size_t index = 0; std::size_t count = 0; unsigned last_value = 0; + (void)last_value; for (const_iterator p = start; p != finish; ++p) { if (p == l) found_l = true; - + if (p == u) { assert(found_l); @@ -210,7 +211,7 @@ void test_loop(Sequence& x, Compare cmp, unsigned long test_count) unsigned value = to_int(*p); assert(value >= last_value); last_value = value; - + if (!found_l) { ++index; @@ -233,6 +234,7 @@ void test_loop(Sequence& x, Compare cmp, unsigned long test_count) assert(range.second == u); bool found = searches<Compare>::binary_search(start, finish, key, cmp); + (void)found; assert(found == (u != l)); std::cout << "found " << count << " copies of " << key << " at index " << index << "\n"; } @@ -247,7 +249,7 @@ int main() test_loop(x, no_compare(), 25); std::cout << "=== testing random-access iterators with compare: ===\n"; test_loop(x, cmp(), 25); - + std::list<mystring> y; std::cout << "=== testing bidirectional iterators with <: ===\n"; test_loop(y, no_compare(), 25); diff --git a/libs/detail/test/is_sorted_test.cpp b/libs/detail/test/is_sorted_test.cpp index b84c5a3ecc..f88d91c8ce 100644 --- a/libs/detail/test/is_sorted_test.cpp +++ b/libs/detail/test/is_sorted_test.cpp @@ -5,15 +5,17 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ==============================================================================*/ -#include <ios> +#include <iostream> #include <boost/config.hpp> #include <boost/array.hpp> #include <boost/detail/is_sorted.hpp> #include <boost/detail/lightweight_test.hpp> template<class T> -struct tracking_less: std::binary_function <T, T, bool> { +struct tracking_less { typedef bool result_type; + typedef T first_argument_type; + typedef T second_argument_type; #if defined(__PATHSCALE__) tracking_less (void) { } @@ -27,8 +29,10 @@ struct tracking_less: std::binary_function <T, T, bool> { }; template<class T> -struct tracking_less_equal: std::binary_function <T, T, bool> { +struct tracking_less_equal { typedef bool result_type; + typedef T first_argument_type; + typedef T second_argument_type; #if defined(__PATHSCALE__) tracking_less_equal (void) { } @@ -42,8 +46,10 @@ struct tracking_less_equal: std::binary_function <T, T, bool> { }; template<class T> -struct tracking_greater: std::binary_function <T, T, bool> { +struct tracking_greater { typedef bool result_type; + typedef T first_argument_type; + typedef T second_argument_type; #if defined(__PATHSCALE__) tracking_greater (void) { } @@ -57,8 +63,10 @@ struct tracking_greater: std::binary_function <T, T, bool> { }; template<class T> -struct tracking_greater_equal: std::binary_function <T, T, bool> { +struct tracking_greater_equal { typedef bool result_type; + typedef T first_argument_type; + typedef T second_argument_type; #if defined(__PATHSCALE__) tracking_greater_equal (void) { } @@ -127,4 +135,3 @@ int main (void) { return report_errors(); } - |