diff options
Diffstat (limited to 'libstdc++-v3/testsuite')
| -rw-r--r-- | libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc | 9 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc | 15 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc | 36 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/headers/algorithm/algorithm_parallel_mode.cc (renamed from libstdc++-v3/testsuite/25_algorithms/headers/algorithm_parallel_mode.cc) | 0 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm.cc (renamed from libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm.cc) | 0 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_mixed1.cc (renamed from libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm_mixed1.cc) | 0 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_mixed2.cc (renamed from libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm_mixed2.cc) | 0 |
7 files changed, 32 insertions, 28 deletions
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc index 8b021755786..8a8951f2db2 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc @@ -16,15 +16,6 @@ // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, // USA. -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - // This file tests explicit instantiation of basic_string #include <debug/string> diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc index 7ebec611d72..3724768d4a6 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc @@ -27,13 +27,20 @@ void test01() { bool test __attribute__((unused)) = true; - std::vector<bool> vb; + using std::vector; + using std::numeric_limits; + +#ifndef _GLIBCXX_DEBUG + using std::_S_word_bit; +#else + using std::_GLIBCXX_STD_D::_S_word_bit; +#endif // Actually, vector<bool> is special, see libstdc++/31370. - typedef std::vector<bool>::difference_type difference_type; + vector<bool> vb; + typedef vector<bool>::difference_type difference_type; VERIFY( vb.max_size() - == (std::numeric_limits<difference_type>::max() - - int(std::_S_word_bit) + 1) ); + == (numeric_limits<difference_type>::max() - int(_S_word_bit) + 1) ); } int main() diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc index 0c4d0a8c1bd..fbbe7b4f586 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc @@ -24,6 +24,12 @@ #include <stdexcept> #include <testsuite_hooks.h> +#ifndef _GLIBCXX_DEBUG + using std::_S_word_bit; +#else + using std::_GLIBCXX_STD_D::_S_word_bit; +#endif + inline void check_cap_ge_size(const std::vector<bool>& x) { @@ -62,7 +68,7 @@ void test01() { std::vector<bool> x; x.resize(x.max_size() / 2 + 1, false); - for(int i = 0; i < std::_S_word_bit; ++i) + for(int i = 0; i < _S_word_bit; ++i) x.push_back(false); check_cap_ge_size(x); } @@ -75,7 +81,7 @@ void test01() { std::vector<bool> x; x.resize(x.max_size() / 2 + 1, false); - x.insert(x.end(), std::_S_word_bit, false); + x.insert(x.end(), _S_word_bit, false); check_cap_ge_size(x); } catch(std::bad_alloc&) @@ -87,7 +93,7 @@ void test01() { std::vector<bool> x; x.resize(x.max_size() / 2 + 1, false); - std::vector<bool> y(std::_S_word_bit, false); + std::vector<bool> y(_S_word_bit, false); x.insert(x.end(), y.begin(), y.end()); check_cap_ge_size(x); } @@ -101,8 +107,8 @@ void test01() try { std::vector<bool> x; - x.resize(x.max_size() - std::_S_word_bit, false); - for(int i = 0; i < std::_S_word_bit; ++i) + x.resize(x.max_size() - _S_word_bit, false); + for(int i = 0; i < _S_word_bit; ++i) x.push_back(false); check_cap_ge_size(x); } @@ -114,8 +120,8 @@ void test01() try { std::vector<bool> x; - x.resize(x.max_size() - std::_S_word_bit, false); - x.insert(x.end(), std::_S_word_bit, false); + x.resize(x.max_size() - _S_word_bit, false); + x.insert(x.end(), _S_word_bit, false); check_cap_ge_size(x); } catch(std::bad_alloc&) @@ -126,8 +132,8 @@ void test01() try { std::vector<bool> x; - x.resize(x.max_size() - std::_S_word_bit, false); - std::vector<bool> y(std::_S_word_bit, false); + x.resize(x.max_size() - _S_word_bit, false); + std::vector<bool> y(_S_word_bit, false); x.insert(x.end(), y.begin(), y.end()); check_cap_ge_size(x); } @@ -141,8 +147,8 @@ void test01() try { std::vector<bool> x; - x.resize(x.max_size() - std::_S_word_bit, false); - for(int i = 0; i < std::_S_word_bit + 1; ++i) + x.resize(x.max_size() - _S_word_bit, false); + for(int i = 0; i < _S_word_bit + 1; ++i) x.push_back(false); ++myexit; } @@ -156,8 +162,8 @@ void test01() try { std::vector<bool> x; - x.resize(x.max_size() - std::_S_word_bit, false); - x.insert(x.end(), std::_S_word_bit + 1, false); + x.resize(x.max_size() - _S_word_bit, false); + x.insert(x.end(), _S_word_bit + 1, false); ++myexit; } catch(std::bad_alloc) @@ -170,8 +176,8 @@ void test01() try { std::vector<bool> x; - x.resize(x.max_size() - std::_S_word_bit, false); - std::vector<bool> y(std::_S_word_bit + 1, false); + x.resize(x.max_size() - _S_word_bit, false); + std::vector<bool> y(_S_word_bit + 1, false); x.insert(x.end(), y.begin(), y.end()); ++myexit; } diff --git a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm_parallel_mode.cc b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/algorithm_parallel_mode.cc index c2e56c2bd35..c2e56c2bd35 100644 --- a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm_parallel_mode.cc +++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/algorithm_parallel_mode.cc diff --git a/libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm.cc b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm.cc index 90e02796263..90e02796263 100644 --- a/libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm.cc +++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm.cc diff --git a/libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm_mixed1.cc b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_mixed1.cc index c6c4ce2ff43..c6c4ce2ff43 100644 --- a/libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm_mixed1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_mixed1.cc diff --git a/libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm_mixed2.cc b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_mixed2.cc index 94794d46c9f..94794d46c9f 100644 --- a/libstdc++-v3/testsuite/25_algorithms/headers/parallel_algorithm_mixed2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_mixed2.cc |