diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 410041da435..2780ccededa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,19 @@ +2001-11-30 Benjamin Kosnik + + libstdc++/3150 + DR/266 + * libsupc++/exception (bad_exception::~bad_exception()): Remove + declaration. + * libsupc++/new (bad_alloc::~bad_alloc()): Remove. + * libsupc++/typeinfo (bad_cast::~bad_cast()): Remove. + (bad_typeid::~bad_typeid()): Remove. + * libsupc++/tinfo.cc (bad_cast::~bad_cast()): Remove definition. + (bad_typeid::~bad_typeid()): Same. + * libsupc++/new_handler.cc (bad_alloc::~bad_alloc()): Same. + * libsupc++/eh_exception.cc (bad_exception::~bad_exception()): Same. + + * include/bits/std_iomanip.h: Tweak. + 2001-11-29 Paolo Carlini libstdc++/3655 diff --git a/libstdc++-v3/include/bits/std_iomanip.h b/libstdc++-v3/include/bits/std_iomanip.h index 3d296b56ba2..ac83db39a63 100644 --- a/libstdc++-v3/include/bits/std_iomanip.h +++ b/libstdc++-v3/include/bits/std_iomanip.h @@ -78,7 +78,7 @@ namespace std struct _Setiosflags { ios_base::fmtflags _M_mask; }; inline _Setiosflags - setiosflags (ios_base::fmtflags __mask) + setiosflags(ios_base::fmtflags __mask) { _Setiosflags __x; __x._M_mask = __mask; @@ -105,7 +105,7 @@ namespace std struct _Setbase { int _M_base; }; inline _Setbase - setbase (int __base) + setbase(int __base) { _Setbase __x; __x._M_base = __base; @@ -216,8 +216,6 @@ namespace std __os.width(__f._M_n); return __os; } - } // namespace std -#endif /* __IOMANIP */ - +#endif diff --git a/libstdc++-v3/libsupc++/eh_exception.cc b/libstdc++-v3/libsupc++/eh_exception.cc index 3c1a7a44ccb..328a89e7f89 100644 --- a/libstdc++-v3/libsupc++/eh_exception.cc +++ b/libstdc++-v3/libsupc++/eh_exception.cc @@ -35,8 +35,6 @@ std::exception::~exception() throw() { } -std::bad_exception::~bad_exception() throw() { } - const char* std::exception::what() const throw() { diff --git a/libstdc++-v3/libsupc++/exception b/libstdc++-v3/libsupc++/exception index 2011abf3282..55dd872cc62 100644 --- a/libstdc++-v3/libsupc++/exception +++ b/libstdc++-v3/libsupc++/exception @@ -62,7 +62,6 @@ namespace std { public: bad_exception() throw() { } - virtual ~bad_exception() throw(); }; /// If you write a replacement %terminate handler, it must be of this type. diff --git a/libstdc++-v3/libsupc++/new b/libstdc++-v3/libsupc++/new index 0d1810c6207..0669f6d0716 100644 --- a/libstdc++-v3/libsupc++/new +++ b/libstdc++-v3/libsupc++/new @@ -50,7 +50,6 @@ namespace std { public: bad_alloc() throw() { } - virtual ~bad_alloc() throw(); }; struct nothrow_t { }; diff --git a/libstdc++-v3/libsupc++/new_handler.cc b/libstdc++-v3/libsupc++/new_handler.cc index 8c1628f4f71..2d3937ecce9 100644 --- a/libstdc++-v3/libsupc++/new_handler.cc +++ b/libstdc++-v3/libsupc++/new_handler.cc @@ -42,5 +42,3 @@ std::set_new_handler (new_handler handler) __new_handler = handler; return prev_handler; } - -std::bad_alloc::~bad_alloc() throw() { } diff --git a/libstdc++-v3/libsupc++/tinfo.cc b/libstdc++-v3/libsupc++/tinfo.cc index 8559a25a039..34b0060b4e9 100644 --- a/libstdc++-v3/libsupc++/tinfo.cc +++ b/libstdc++-v3/libsupc++/tinfo.cc @@ -39,9 +39,6 @@ std::type_info:: ~type_info () { } -std::bad_cast::~bad_cast() throw() { } -std::bad_typeid::~bad_typeid() throw() { } - #if !__GXX_MERGED_TYPEINFO_NAMES // We can't rely on common symbols being shared between shared objects. diff --git a/libstdc++-v3/libsupc++/typeinfo b/libstdc++-v3/libsupc++/typeinfo index 3d9afc90470..c45f54431fe 100644 --- a/libstdc++-v3/libsupc++/typeinfo +++ b/libstdc++-v3/libsupc++/typeinfo @@ -129,7 +129,6 @@ namespace std { public: bad_cast() throw() { } - virtual ~bad_cast() throw(); }; /** If you use a NULL pointer in a @c typeid expression, this is thrown. */ @@ -137,7 +136,6 @@ namespace std { public: bad_typeid () throw() { } - virtual ~bad_typeid () throw(); }; } // namespace std