Revert [67111] (addition of boost/detail/iomanip.hpp) and all the commits that depend on it. ([68137], [68140], [68141], [68154], and [68165]).

[SVN r68168]
This commit is contained in:
Steven Watanabe
2011-01-15 08:11:51 +00:00
parent f1a4e59469
commit c210c38dae
6 changed files with 5 additions and 44 deletions

View File

@ -13,7 +13,7 @@
#endif #endif
#include <boost/exception/detail/type_info.hpp> #include <boost/exception/detail/type_info.hpp>
#include <boost/detail/iomanip.hpp> #include <iomanip>
#include <ios> #include <ios>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -36,9 +36,9 @@ boost
s.fill('0'); s.fill('0');
s.width(2); s.width(2);
unsigned char const * b=reinterpret_cast<unsigned char const *>(&x); unsigned char const * b=reinterpret_cast<unsigned char const *>(&x);
s << boost::detail::setw(2) << std::hex << (unsigned int)*b; s << std::setw(2) << std::hex << (unsigned int)*b;
for( unsigned char const * e=b+n; ++b!=e; ) for( unsigned char const * e=b+n; ++b!=e; )
s << " " << boost::detail::setw(2) << std::hex << (unsigned int)*b; s << " " << std::setw(2) << std::hex << (unsigned int)*b;
return s.str(); return s.str();
} }
} }

View File

@ -27,10 +27,6 @@ may_throw_on_copy
if( throw_ ) if( throw_ )
throw T(); throw T();
} }
#if defined(__PATHSCALE__)
~may_throw_on_copy() throw() {}
#endif
bool throw_; bool throw_;
}; };
@ -63,9 +59,6 @@ struct
derives_std_exception: derives_std_exception:
std::exception std::exception
{ {
#if defined(__PATHSCALE__)
~derives_std_exception() throw() {}
#endif
}; };
struct struct
@ -84,19 +77,12 @@ derives_std_boost_exception:
{ {
return wh_; return wh_;
} }
#if defined(__PATHSCALE__)
~derives_std_boost_exception() throw() {}
#endif
}; };
struct struct
derives_boost_exception: derives_boost_exception:
boost::exception boost::exception
{ {
#if defined(__PATHSCALE__)
~derives_boost_exception() throw() {}
#endif
}; };
template <class T> template <class T>

View File

@ -30,10 +30,6 @@ error1:
std::exception, std::exception,
boost::exception boost::exception
{ {
#if defined(__PATHSCALE__)
~error1() throw() {}
#endif
char const * char const *
what() const throw() what() const throw()
{ {
@ -45,9 +41,6 @@ struct
error2: error2:
boost::exception boost::exception
{ {
#if defined(__PATHSCALE__)
~error2() throw() {}
#endif
}; };
struct struct
@ -59,9 +52,6 @@ error3:
{ {
return "error3"; return "error3";
} }
#if defined(__PATHSCALE__)
~error3() throw() {}
#endif
}; };
struct struct
@ -74,9 +64,6 @@ error4:
{ {
return diagnostic_information_what(*this); return diagnostic_information_what(*this);
} }
#if defined(__PATHSCALE__)
~error4() throw() {}
#endif
}; };
void void

View File

@ -22,9 +22,6 @@ test_exception:
virtual boost::exception, virtual boost::exception,
virtual std::exception virtual std::exception
{ {
#if defined(__PATHSCALE__)
~test_exception() throw() {}
#endif
}; };
int int

View File

@ -21,9 +21,6 @@ my_exception:
{ {
return "my_exception"; return "my_exception";
} }
#if defined(__PATHSCALE__)
~my_exception() throw() {}
#endif
}; };
typedef boost::error_info<struct my_tag,int> my_int; typedef boost::error_info<struct my_tag,int> my_int;

View File

@ -15,9 +15,6 @@ struct
exception1: exception1:
std::exception std::exception
{ {
#if defined(__PATHSCALE__)
~exception1() throw() {}
#endif
}; };
struct struct
@ -25,9 +22,6 @@ exception2:
std::exception, std::exception,
boost::exception boost::exception
{ {
#if defined(__PATHSCALE__)
~exception2() throw() {}
#endif
}; };
void void
@ -46,7 +40,7 @@ boost_throw_exception_test()
int const * line=boost::get_error_info<boost::throw_line>(x); int const * line=boost::get_error_info<boost::throw_line>(x);
BOOST_TEST( file && *file ); BOOST_TEST( file && *file );
BOOST_TEST( function && *function ); BOOST_TEST( function && *function );
BOOST_TEST( line && *line==38 ); BOOST_TEST( line && *line==32 );
} }
catch( catch(
... ) ... )
@ -67,7 +61,7 @@ boost_throw_exception_test()
int const * data=boost::get_error_info<test_data>(x); int const * data=boost::get_error_info<test_data>(x);
BOOST_TEST( file && *file ); BOOST_TEST( file && *file );
BOOST_TEST( function && *function ); BOOST_TEST( function && *function );
BOOST_TEST( line && *line==58 ); BOOST_TEST( line && *line==52 );
BOOST_TEST( data && *data==42 ); BOOST_TEST( data && *data==42 );
} }
catch( catch(