libstdc++: Fix some more warnings in test
libstdc++-v3/ChangeLog: * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Avoid -Wcatch-value warnings.
This commit is contained in:
parent
667db6dedd
commit
d1e5d82af8
@ -59,14 +59,14 @@ void test01()
|
|||||||
{ }
|
{ }
|
||||||
catch(std::exception&)
|
catch(std::exception&)
|
||||||
{ ++myexit; }
|
{ ++myexit; }
|
||||||
|
|
||||||
// When doubling is too big, but smaller is sufficient, the resize
|
// When doubling is too big, but smaller is sufficient, the resize
|
||||||
// should do smaller and be happy. It certainly shouldn't throw
|
// should do smaller and be happy. It certainly shouldn't throw
|
||||||
// other exceptions or crash.
|
// other exceptions or crash.
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::vector<bool> x;
|
std::vector<bool> x;
|
||||||
x.resize(x.max_size() / 2 + 1, false);
|
x.resize(x.max_size() / 2 + 1, false);
|
||||||
for(int i = 0; i < _S_word_bit; ++i)
|
for(int i = 0; i < _S_word_bit; ++i)
|
||||||
x.push_back(false);
|
x.push_back(false);
|
||||||
check_cap_ge_size(x);
|
check_cap_ge_size(x);
|
||||||
@ -75,11 +75,11 @@ void test01()
|
|||||||
{ }
|
{ }
|
||||||
catch(std::exception&)
|
catch(std::exception&)
|
||||||
{ ++myexit; }
|
{ ++myexit; }
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::vector<bool> x;
|
std::vector<bool> x;
|
||||||
x.resize(x.max_size() / 2 + 1, false);
|
x.resize(x.max_size() / 2 + 1, false);
|
||||||
x.insert(x.end(), _S_word_bit, false);
|
x.insert(x.end(), _S_word_bit, false);
|
||||||
check_cap_ge_size(x);
|
check_cap_ge_size(x);
|
||||||
}
|
}
|
||||||
@ -87,11 +87,11 @@ void test01()
|
|||||||
{ }
|
{ }
|
||||||
catch(std::exception&)
|
catch(std::exception&)
|
||||||
{ ++myexit; }
|
{ ++myexit; }
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::vector<bool> x;
|
std::vector<bool> x;
|
||||||
x.resize(x.max_size() / 2 + 1, false);
|
x.resize(x.max_size() / 2 + 1, false);
|
||||||
std::vector<bool> y(_S_word_bit, false);
|
std::vector<bool> y(_S_word_bit, false);
|
||||||
x.insert(x.end(), y.begin(), y.end());
|
x.insert(x.end(), y.begin(), y.end());
|
||||||
check_cap_ge_size(x);
|
check_cap_ge_size(x);
|
||||||
@ -106,7 +106,7 @@ void test01()
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::vector<bool> x;
|
std::vector<bool> x;
|
||||||
x.resize(x.max_size() - _S_word_bit, false);
|
x.resize(x.max_size() - _S_word_bit, false);
|
||||||
for(int i = 0; i < _S_word_bit; ++i)
|
for(int i = 0; i < _S_word_bit; ++i)
|
||||||
x.push_back(false);
|
x.push_back(false);
|
||||||
check_cap_ge_size(x);
|
check_cap_ge_size(x);
|
||||||
@ -115,11 +115,11 @@ void test01()
|
|||||||
{ }
|
{ }
|
||||||
catch(std::exception&)
|
catch(std::exception&)
|
||||||
{ ++myexit; }
|
{ ++myexit; }
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::vector<bool> x;
|
std::vector<bool> x;
|
||||||
x.resize(x.max_size() - _S_word_bit, false);
|
x.resize(x.max_size() - _S_word_bit, false);
|
||||||
x.insert(x.end(), _S_word_bit, false);
|
x.insert(x.end(), _S_word_bit, false);
|
||||||
check_cap_ge_size(x);
|
check_cap_ge_size(x);
|
||||||
}
|
}
|
||||||
@ -131,7 +131,7 @@ void test01()
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::vector<bool> x;
|
std::vector<bool> x;
|
||||||
x.resize(x.max_size() - _S_word_bit, false);
|
x.resize(x.max_size() - _S_word_bit, false);
|
||||||
std::vector<bool> y(_S_word_bit, false);
|
std::vector<bool> y(_S_word_bit, false);
|
||||||
x.insert(x.end(), y.begin(), y.end());
|
x.insert(x.end(), y.begin(), y.end());
|
||||||
check_cap_ge_size(x);
|
check_cap_ge_size(x);
|
||||||
@ -140,51 +140,51 @@ void test01()
|
|||||||
{ }
|
{ }
|
||||||
catch(std::exception&)
|
catch(std::exception&)
|
||||||
{ ++myexit; }
|
{ ++myexit; }
|
||||||
|
|
||||||
// Attempts to put in more than max_size() items should result in a
|
// Attempts to put in more than max_size() items should result in a
|
||||||
// length error.
|
// length error.
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::vector<bool> x;
|
std::vector<bool> x;
|
||||||
x.resize(x.max_size() - _S_word_bit, false);
|
x.resize(x.max_size() - _S_word_bit, false);
|
||||||
for(int i = 0; i < _S_word_bit + 1; ++i)
|
for(int i = 0; i < _S_word_bit + 1; ++i)
|
||||||
x.push_back(false);
|
x.push_back(false);
|
||||||
++myexit;
|
++myexit;
|
||||||
}
|
}
|
||||||
catch(std::bad_alloc)
|
catch(std::bad_alloc&)
|
||||||
{ }
|
{ }
|
||||||
catch(std::length_error)
|
catch(std::length_error&)
|
||||||
{ }
|
{ }
|
||||||
catch(std::exception)
|
catch(std::exception&)
|
||||||
{ ++myexit; }
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
std::vector<bool> x;
|
|
||||||
x.resize(x.max_size() - _S_word_bit, false);
|
|
||||||
x.insert(x.end(), _S_word_bit + 1, false);
|
|
||||||
++myexit;
|
|
||||||
}
|
|
||||||
catch(std::bad_alloc)
|
|
||||||
{ }
|
|
||||||
catch(std::length_error)
|
|
||||||
{ }
|
|
||||||
catch(std::exception)
|
|
||||||
{ ++myexit; }
|
{ ++myexit; }
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::vector<bool> x;
|
std::vector<bool> x;
|
||||||
x.resize(x.max_size() - _S_word_bit, false);
|
x.resize(x.max_size() - _S_word_bit, false);
|
||||||
|
x.insert(x.end(), _S_word_bit + 1, false);
|
||||||
|
++myexit;
|
||||||
|
}
|
||||||
|
catch(std::bad_alloc&)
|
||||||
|
{ }
|
||||||
|
catch(std::length_error&)
|
||||||
|
{ }
|
||||||
|
catch(std::exception&)
|
||||||
|
{ ++myexit; }
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
std::vector<bool> x;
|
||||||
|
x.resize(x.max_size() - _S_word_bit, false);
|
||||||
std::vector<bool> y(_S_word_bit + 1, false);
|
std::vector<bool> y(_S_word_bit + 1, false);
|
||||||
x.insert(x.end(), y.begin(), y.end());
|
x.insert(x.end(), y.begin(), y.end());
|
||||||
++myexit;
|
++myexit;
|
||||||
}
|
}
|
||||||
catch(std::bad_alloc)
|
catch(std::bad_alloc&)
|
||||||
{ }
|
{ }
|
||||||
catch(std::length_error)
|
catch(std::length_error&)
|
||||||
{ }
|
{ }
|
||||||
catch(std::exception)
|
catch(std::exception&)
|
||||||
{ ++myexit; }
|
{ ++myexit; }
|
||||||
|
|
||||||
VERIFY( !myexit );
|
VERIFY( !myexit );
|
||||||
|
Loading…
Reference in New Issue
Block a user