diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f3ca34ee343..65998e324e1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,15 @@ 2016-07-15 Jonathan Wakely + * include/bits/algorithmfwd.h: Change C++0x to C++11 in comments. + * include/bits/move.h: Likewise. + * include/bits/postypes.h: Likewise. + * include/debug/bitset: Likewise. + * include/ext/pb_ds/detail/type_utils.hpp: Likewise. + * include/ext/string_conversions.h: Change C++0x to __cxx11 in + comment. + * testsuite/27_io/fpos/14320-1.cc: Change C++0x to C++11 in comment. + * testsuite/util/thread/all.h: Likewise. + * include/bits/stl_algo.h (for_each): Remove redundant _GLIBCXX_MOVE and adjust comment. diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h index 1defb1d9080..c6481691236 100644 --- a/libstdc++-v3/include/bits/algorithmfwd.h +++ b/libstdc++-v3/include/bits/algorithmfwd.h @@ -45,14 +45,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /* adjacent_find - all_of (C++0x) - any_of (C++0x) + all_of (C++11) + any_of (C++11) binary_search clamp (C++17) copy copy_backward - copy_if (C++0x) - copy_n (C++0x) + copy_if (C++11) + copy_n (C++11) count count_if equal @@ -63,17 +63,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION find_end find_first_of find_if - find_if_not (C++0x) + find_if_not (C++11) for_each generate generate_n includes inplace_merge - is_heap (C++0x) - is_heap_until (C++0x) - is_partitioned (C++0x) - is_sorted (C++0x) - is_sorted_until (C++0x) + is_heap (C++11) + is_heap_until (C++11) + is_partitioned (C++11) + is_sorted (C++11) + is_sorted_until (C++11) iter_swap lexicographical_compare lower_bound @@ -83,17 +83,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION merge min min_element - minmax (C++0x) - minmax_element (C++0x) + minmax (C++11) + minmax_element (C++11) mismatch next_permutation - none_of (C++0x) + none_of (C++11) nth_element partial_sort partial_sort_copy partition - partition_copy (C++0x) - partition_point (C++0x) + partition_copy (C++11) + partition_point (C++11) pop_heap prev_permutation push_heap @@ -116,7 +116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION set_intersection set_symmetric_difference set_union - shuffle (C++0x) + shuffle (C++11) sort sort_heap stable_partition diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h index afcea2d8468..9deec427e24 100644 --- a/libstdc++-v3/include/bits/move.h +++ b/libstdc++-v3/include/bits/move.h @@ -1,4 +1,4 @@ -// Move, forward and identity for C++0x + swap -*- C++ -*- +// Move, forward and identity for C++11 + swap -*- C++ -*- // Copyright (C) 2007-2016 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/include/bits/postypes.h b/libstdc++-v3/include/bits/postypes.h index f63571eeb8b..bdd1f4adb5d 100644 --- a/libstdc++-v3/include/bits/postypes.h +++ b/libstdc++-v3/include/bits/postypes.h @@ -41,7 +41,7 @@ // XXX If is really needed, make sure to define the macros // before including it, in order not to break (and -// in C++0x). Reconsider all this as soon as possible... +// in C++11). Reconsider all this as soon as possible... #if (defined(_GLIBCXX_HAVE_INT64_T) && !defined(_GLIBCXX_HAVE_INT64_T_LONG) \ && !defined(_GLIBCXX_HAVE_INT64_T_LONG_LONG)) diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset index 1353aa38074..55d3281ee3d 100644 --- a/libstdc++-v3/include/debug/bitset +++ b/libstdc++-v3/include/debug/bitset @@ -50,7 +50,7 @@ namespace __debug typedef _GLIBCXX_STD_C::bitset<_Nb> _Base; public: - // In C++0x we rely on normal reference type to preserve the property + // In C++11 we rely on normal reference type to preserve the property // of bitset to be use as a literal. // TODO: Find another solution. #if __cplusplus >= 201103L diff --git a/libstdc++-v3/include/ext/pb_ds/detail/type_utils.hpp b/libstdc++-v3/include/ext/pb_ds/detail/type_utils.hpp index f0c398364fd..602c28bbdf6 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/type_utils.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/type_utils.hpp @@ -131,7 +131,7 @@ namespace __gnu_pbds }; }; - // Use C++0x's static_assert if possible. + // Use C++11's static_assert if possible. #if __cplusplus >= 201103L #define PB_DS_STATIC_ASSERT(UNIQUE, E) static_assert(E, #UNIQUE) #else diff --git a/libstdc++-v3/include/ext/string_conversions.h b/libstdc++-v3/include/ext/string_conversions.h index 0a0036d255e..fc451f00a86 100644 --- a/libstdc++-v3/include/ext/string_conversions.h +++ b/libstdc++-v3/include/ext/string_conversions.h @@ -100,8 +100,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __builtin_va_list), std::size_t __n, const _CharT* __fmt, ...) { - // XXX Eventually the result will be constructed in place in - // the C++0x string, likely with the help of internal hooks. + // XXX Eventually the result should be constructed in-place in + // the __cxx11 string, likely with the help of internal hooks. _CharT* __s = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) * __n)); diff --git a/libstdc++-v3/testsuite/27_io/fpos/14320-1.cc b/libstdc++-v3/testsuite/27_io/fpos/14320-1.cc index 6211a8f28b1..5b348ec58ca 100644 --- a/libstdc++-v3/testsuite/27_io/fpos/14320-1.cc +++ b/libstdc++-v3/testsuite/27_io/fpos/14320-1.cc @@ -36,7 +36,7 @@ void test01() bool found = false; // The C++ standard didn't originally have "long long", however that - // type will be in the C++0x standard and testing for it allows + // type is in the C++11 standard and testing for it allows // ilp32 targets to pass this test when `Distance' is 64 bits. if (typeid(Distance) == typeid(long long int)) found = true; diff --git a/libstdc++-v3/testsuite/util/thread/all.h b/libstdc++-v3/testsuite/util/thread/all.h index bc6038ceabb..3d982acaaaa 100644 --- a/libstdc++-v3/testsuite/util/thread/all.h +++ b/libstdc++-v3/testsuite/util/thread/all.h @@ -26,7 +26,7 @@ #include #include -// C++0x only. +// C++11 only. namespace __gnu_test { // Assume _Tp::native_handle_type.