10132-1.cc: Explicitly qualify exceptions.

2003-09-26  Brad Spencer  <spencer@infointeractive.com>

	* testsuite/27_io/basic_filebuf/cons/wchar_t/10132-1.cc:
	Explicitly qualify exceptions.
	* testsuite/27_io/basic_istream/sentry/char/3983-fstream.cc: Same.
	* testsuite/27_io/basic_istream/sentry/char/3983-sstream.cc: Same.
	* testsuite/27_io/basic_ostream/sentry/char/3983-fstream.cc: Same.
	* testsuite/27_io/basic_ostream/sentry/char/3983-sstream.cc: Same.

From-SVN: r71832
This commit is contained in:
Brad Spencer 2003-09-26 20:20:55 +00:00 committed by Benjamin Kosnik
parent 6634a0e914
commit 2d07c3f562
6 changed files with 43 additions and 44 deletions

View File

@ -1,3 +1,12 @@
2003-09-26 Brad Spencer <spencer@infointeractive.com>
* testsuite/27_io/basic_filebuf/cons/wchar_t/10132-1.cc:
Explicitly qualify exceptions.
* testsuite/27_io/basic_istream/sentry/char/3983-fstream.cc: Same.
* testsuite/27_io/basic_istream/sentry/char/3983-sstream.cc: Same.
* testsuite/27_io/basic_ostream/sentry/char/3983-fstream.cc: Same.
* testsuite/27_io/basic_ostream/sentry/char/3983-sstream.cc: Same.
2003-09-25 Paolo Carlini <pcarlini@unitus.it>
PR libstdc++/12352

View File

@ -33,20 +33,19 @@ protected:
int main()
{
using namespace std;
bool test __attribute__((unused)) = true;
locale loc = locale(locale::classic(), new Cvt);
wfilebuf* fb = new wfilebuf;
std::locale loc = std::locale(std::locale::classic(), new Cvt);
std::wfilebuf* fb = new std::wfilebuf;
fb->pubimbue(loc);
fb->open("tmp_10132", ios_base::out);
fb->open("tmp_10132", std::ios_base::out);
fb->sputc(L'a');
try
{
delete fb;
}
catch(exception& obj)
catch(std::exception& obj)
{
VERIFY( false );
}

View File

@ -124,49 +124,47 @@ namespace std
// Sentry uses locale info, so have to try one formatted input/output.
void test03()
{
using namespace std;
bool test __attribute__((unused)) = true;
// input streams
basic_ifstream<unsigned char> ifs_uc;
std::basic_ifstream<unsigned char> ifs_uc;
unsigned char arr[6] = { 'a', 'b', 'c', 'd', 'e' };
try
{
int i;
ifs_uc >> i;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
catch (std::exception& obj)
{ test = false; }
try
{
ifs_uc >> arr;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
catch (std::exception& obj)
{ test = false; }
try
{
ifs_uc >> ws;
ifs_uc >> std::ws;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
catch (std::exception& obj)
{ test = false; }
try
{
basic_string<unsigned char> s_uc(arr);
std::basic_string<unsigned char> s_uc(arr);
ifs_uc >> s_uc;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
catch (std::exception& obj)
{ test = false; }
VERIFY( test );

View File

@ -124,11 +124,10 @@ namespace std
// Sentry uses locale info, so have to try one formatted input/output.
void test03()
{
using namespace std;
bool test __attribute__((unused)) = true;
// input streams
basic_istringstream<unsigned char> iss_uc;
std::basic_istringstream<unsigned char> iss_uc;
unsigned char arr[6] = { 'a', 'b', 'c', 'd', 'e' };
try
@ -136,37 +135,37 @@ void test03()
int i;
iss_uc >> i;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
catch (std::exception& obj)
{ test = false; }
try
{
iss_uc >> arr;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
catch (std::exception& obj)
{ test = false; }
try
{
iss_uc >> ws;
iss_uc >> std::ws;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
catch (std::exception& obj)
{ test = false; }
try
{
basic_string<unsigned char> s_uc(arr);
std::basic_string<unsigned char> s_uc(arr);
iss_uc >> s_uc;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
catch (std::exception& obj)
{ test = false; }
VERIFY( test );

View File

@ -124,22 +124,19 @@ namespace std
// Sentry uses locale info, so have to try one formatted input/output.
void test03()
{
using namespace std;
bool test __attribute__((unused)) = true;
// output streams
basic_ofstream<unsigned char> ofs_uc;
std::basic_ofstream<unsigned char> ofs_uc;
try
{
bool b = true;
ofs_uc << b;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
{ test = false; }
catch (std::exception& obj)
{ test = false; }
VERIFY( test );
}

View File

@ -124,22 +124,19 @@ namespace std
// Sentry uses locale info, so have to try one formatted input/output.
void test03()
{
using namespace std;
bool test __attribute__((unused)) = true;
// output streams
basic_ostringstream<unsigned char> oss_uc;
std::basic_ostringstream<unsigned char> oss_uc;
try
{
bool b = true;
oss_uc << b;
}
catch (bad_cast& obj)
catch (std::bad_cast& obj)
{ }
catch (exception& obj)
{ test = false; }
catch (std::exception& obj)
{ test = false; }
VERIFY( test );
}