boostorg/io
1
0
Fork 1
mirror of https://github.com/boostorg/io.git synced 2025-07-30 04:17:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from eldiener/develop

Browse Source 
Fix for gcc and clang. Right now gcc throws an old ABI version of std…
This commit is contained in:
Edward Diener
2017-01-29 15:23:39 -08:00
committed by GitHub
parent b3e349c595 436e153c3e
commit 00ef24c843
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/ios_state_test.cpp
View File

@ -10,6 +10,7 @@
// 15 Jun 2003 Adjust to changes in Boost.Test (Daryle Walker) // 15 Jun 2003 Adjust to changes in Boost.Test (Daryle Walker)
// 26 Feb 2002 Initial version (Daryle Walker) // 26 Feb 2002 Initial version (Daryle Walker)
#include <boost/config.hpp>
#include <boost/test/minimal.hpp> // main, BOOST_CHECK, etc. #include <boost/test/minimal.hpp> // main, BOOST_CHECK, etc.
#include <boost/cstdlib.hpp> // for boost::exit_success #include <boost/cstdlib.hpp> // for boost::exit_success
@ -24,7 +25,9 @@
#include <ostream> // for std::endl, std::ostream #include <ostream> // for std::endl, std::ostream
#include <streambuf> // for std::streambuf #include <streambuf> // for std::streambuf
#include <string> // for std::string #include <string> // for std::string
#if defined(BOOST_GCC) || (defined(BOOST_CLANG) && defined(BOOST_GNU_STDLIB))
#include <stdexcept>
#endif
// Facet with the bool names spelled backwards // Facet with the bool names spelled backwards
class backward_bool_names class backward_bool_names
@ -181,11 +184,15 @@ saver_tests_1
boost::io::ios_exception_saver const ies( output ); boost::io::ios_exception_saver const ies( output );
boost::io::ios_iostate_saver const iis( output ); boost::io::ios_iostate_saver const iis( output );
output.exceptions( ios_base::eofbit ); output.exceptions( ios_base::eofbit | ios_base::badbit );
output.setstate( ios_base::eofbit ); output.setstate( ios_base::eofbit );
BOOST_ERROR( "previous line should have thrown" ); BOOST_ERROR( "previous line should have thrown" );
} }
#if defined(BOOST_GCC) || (defined(BOOST_CLANG) && defined(BOOST_GNU_STDLIB))
catch ( std::exception &f )
#else
catch ( ios_base::failure &f ) catch ( ios_base::failure &f )
#endif
{ {
err << "Got the expected I/O failure: \"" << f.what() << "\".\n"; err << "Got the expected I/O failure: \"" << f.what() << "\".\n";
BOOST_CHECK( output.exceptions() == ios_base::goodbit ); BOOST_CHECK( output.exceptions() == ios_base::goodbit );
@ -243,7 +250,11 @@ saver_tests_2
BOOST_ERROR( "previous line should have thrown" ); BOOST_ERROR( "previous line should have thrown" );
} }
#if defined(BOOST_GCC) || (defined(BOOST_CLANG) && defined(BOOST_GNU_STDLIB))
catch ( std::exception &f )
#else
catch ( ios_base::failure &f ) catch ( ios_base::failure &f )
#endif
{ {
err << "Got the expected I/O failure: \"" << f.what() << "\".\n"; err << "Got the expected I/O failure: \"" << f.what() << "\".\n";
BOOST_CHECK( output.exceptions() == ios_base::goodbit ); BOOST_CHECK( output.exceptions() == ios_base::goodbit );

14
test/ios_state_unit_test.cpp
View File

@ -9,6 +9,7 @@
// Revision History // Revision History
// 12 Sep 2003 Initial version (Daryle Walker) // 12 Sep 2003 Initial version (Daryle Walker)
#include <boost/config.hpp>
#include <boost/io/ios_state.hpp> // for boost::io::ios_flags_saver, etc. #include <boost/io/ios_state.hpp> // for boost::io::ios_flags_saver, etc.
#include <boost/test/unit_test.hpp> // for main, BOOST_CHECK, etc. #include <boost/test/unit_test.hpp> // for main, BOOST_CHECK, etc.
@ -19,6 +20,9 @@
#include <istream> // for std::iostream #include <istream> // for std::iostream
#include <locale> // for std::locale, std::numpunct #include <locale> // for std::locale, std::numpunct
#include <sstream> // for std::stringstream, etc. #include <sstream> // for std::stringstream, etc.
#if defined(BOOST_GCC) || (defined(BOOST_CLANG) && defined(BOOST_GNU_STDLIB))
#include <stdexcept>
#endif
// Global constants // Global constants
@ -226,9 +230,14 @@ ios_exception_saver_unit_test
{ {
boost::io::ios_iostate_saver iis( ss ); boost::io::ios_iostate_saver iis( ss );
ss.exceptions( ios_base::failbit | ios_base::badbit );
char c; char c;
#if defined(BOOST_GCC) || (defined(BOOST_CLANG) && defined(BOOST_GNU_STDLIB))
BOOST_CHECK_THROW( ss >> c, std::exception );
#else
BOOST_CHECK_THROW( ss >> c, std::ios_base::failure ); BOOST_CHECK_THROW( ss >> c, std::ios_base::failure );
#endif
} }
} }
@ -575,9 +584,14 @@ ios_all_saver_unit_test
{ {
boost::io::ios_iostate_saver iis( ss ); boost::io::ios_iostate_saver iis( ss );
ss.exceptions( ios_base::failbit | ios_base::badbit );
char c; char c;
#if defined(BOOST_GCC) || (defined(BOOST_CLANG) && defined(BOOST_GNU_STDLIB))
BOOST_CHECK_THROW( ss >> c, std::exception );
#else
BOOST_CHECK_THROW( ss >> c, std::ios_base::failure ); BOOST_CHECK_THROW( ss >> c, std::ios_base::failure );
#endif
} }
ss.tie( &clog ); ss.tie( &clog );