--- a/usr/src/lib/stdcxx4/Solaris/diffs/6920783-locale.66.diff Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/lib/stdcxx4/Solaris/diffs/6920783-locale.66.diff Fri Jul 15 23:48:44 2011 -0700
@@ -1,6 +1,6 @@
---- stdcxx-4.2.1/include/loc/_codecvt.h 2008-04-24 20:23:39.000000000 -0400
-+++ stdcxx-4.2.1/include/loc/_codecvt.h 2011-01-07 18:25:32.742687311 -0500
-@@ -48,9 +48,15 @@
+--- stdcxx-4.2.1/include/loc/_codecvt.h 2008-04-24 17:23:39.000000000 -0700
++++ stdcxx-4.2.1/include/loc/_codecvt.h 2011-06-09 12:32:15.715973839 -0700
+@@ -48,9 +48,12 @@
// 22.2.1.5 - Template class codecvt
@@ -10,14 +10,11 @@
+public:
enum result { ok, partial, error, noconv };
+
-+ codecvt_base () { }
-+
-+protected:
-+ virtual ~codecvt_base () _THROWS(()) { }
++ virtual ~codecvt_base () { }
};
-@@ -188,8 +194,6 @@
+@@ -188,8 +191,6 @@
_EXPLICIT codecvt (_RWSTD_SIZE_T = 0);
@@ -26,25 +23,24 @@
result out (state_type &__state,
const intern_type *__from, const intern_type* __from_end,
const intern_type *&__from_next,
-@@ -234,6 +238,8 @@
+@@ -234,6 +235,8 @@
protected:
-+ virtual ~codecvt () _THROWS (());
++ virtual ~codecvt ();
+
virtual result
do_out (state_type&,
const intern_type*, const intern_type*, const intern_type*&,
-@@ -303,6 +309,8 @@
+@@ -303,6 +306,8 @@
protected:
-+ virtual ~codecvt () _THROWS(());
++ virtual ~codecvt ();
+
virtual result
do_out (state_type&, const intern_type*, const intern_type*,
const intern_type*&,
-
#===========================================================================#
--- stdcxx-4.2.1/include/loc/_collate.h 2008-04-24 20:23:39.000000000 -0400
@@ -53,7 +49,7 @@
protected:
-+ virtual ~collate () _THROWS(()) { }
++ virtual ~collate () { }
+
// protected virtual members are not defined
virtual int
@@ -62,7 +58,7 @@
protected:
-+ virtual ~collate () _THROWS(()) { }
++ virtual ~collate () { }
+
virtual int
do_compare (const char_type*, const char_type*,
@@ -71,7 +67,7 @@
protected:
-+ virtual ~collate () _THROWS(()) { }
++ virtual ~collate () { }
virtual int
do_compare (const char_type*, const char_type*,
const char_type*, const char_type*) const;
@@ -82,7 +78,7 @@
+
+protected:
+
-+ virtual collate_byname () _THROWS(()) { }
++ virtual collate_byname () { }
};
@@ -90,7 +86,7 @@
protected:
-+ virtual ~collate_byname() _THROWS(()) { }
++ virtual ~collate_byname() { }
+
virtual int
do_compare (const char_type*, const char_type*,
@@ -99,7 +95,7 @@
protected:
-+ virtual ~collate_byname () _THROWS(()) { }
++ virtual ~collate_byname () { }
+
virtual int
do_compare (const char_type*, const char_type*,
@@ -112,9 +108,9 @@
#===========================================================================#
---- stdcxx-4.2.1/include/loc/_ctype.h 2008-04-24 20:23:39.000000000 -0400
-+++ stdcxx-4.2.1/include/loc/_ctype.h 2011-01-07 18:28:33.353937253 -0500
-@@ -64,11 +64,15 @@
+--- stdcxx-4.2.1/include/loc/_ctype.h 2008-04-24 17:23:39.000000000 -0700
++++ stdcxx-4.2.1/include/loc/_ctype.h 2011-06-09 12:32:41.296525908 -0700
+@@ -64,11 +64,12 @@
_RWSTD_NAMESPACE (std) {
@@ -126,24 +122,19 @@
+class _RWSTD_EXPORT ctype_base
{
+public:
-+
-+ ctype_base () { }
-+
// 22.2.1, p1 - mask is a bitmask type (see 17.3.3.1.2)
typedef _RWSTD_BITMASK_ENUM (_RW::__rw_ctype_mask) mask;
-@@ -83,6 +87,10 @@
+@@ -83,6 +84,8 @@
_RWSTD_STATIC_CONST (mask, xdigit = _RW::__rw_xdigit);
_RWSTD_STATIC_CONST (mask, alnum = _RW::__rw_alnum);
_RWSTD_STATIC_CONST (mask, graph = _RW::__rw_graph);
+
-+protected:
-+
-+ virtual ~ctype_base () _THROWS(()) { }
++ virtual ~ctype_base () { }
};
-@@ -103,7 +111,8 @@
+@@ -103,7 +106,8 @@
typedef _CharT char_type;
_EXPLICIT ctype (_RWSTD_SIZE_T __ref = 0)
@@ -153,70 +144,69 @@
// 22.2.1.1.1, p1
-@@ -171,6 +180,8 @@
+@@ -171,6 +175,8 @@
protected:
-+ virtual ~ctype () _THROWS(()) { }
++ virtual ~ctype () { }
+
// 22.2.1.1.2, p1
virtual bool do_is (mask, char_type) const {
return false;
-@@ -292,7 +303,7 @@
+@@ -292,7 +298,7 @@
static const mask* classic_table () _THROWS (());
- virtual ~ctype ();
-+ virtual ~ctype () _THROWS(());
++ virtual ~ctype ();
virtual const char_type*
do_toupper (char_type*, const char_type*) const;
-@@ -394,6 +405,10 @@
+@@ -394,6 +400,10 @@
: ctype<_CharT>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
+
+protected:
+
-+ virtual ~ctype_byname () _THROWS(()) { }
++ virtual ~ctype_byname () { }
};
-@@ -405,6 +420,10 @@
+@@ -405,6 +415,10 @@
public:
_EXPLICIT ctype_byname (const char*, _RWSTD_SIZE_T = 0);
+
+protected:
+
-+ virtual ~ctype_byname () _THROWS (()) { }
++ virtual ~ctype_byname () { }
};
-@@ -484,7 +503,7 @@
+@@ -484,7 +498,7 @@
protected:
- virtual ~ctype ();
-+ virtual ~ctype () _THROWS(());
++ virtual ~ctype ();
// 22.2.1.1.2, p1
virtual bool do_is (mask, char_type) const;
-@@ -597,7 +616,7 @@
+@@ -597,7 +611,7 @@
protected:
- virtual ~ctype_byname ();
-+ virtual ~ctype_byname () _THROWS (());
++ virtual ~ctype_byname ();
virtual bool
do_is (mask, char_type) const;
-@@ -653,3 +672,4 @@
+@@ -653,3 +667,4 @@
#endif // _RWSTD_LOC_CTYPE_H_INCLUDED
+
-
#===========================================================================#
--- stdcxx-4.2.1/include/loc/_facet.h 2008-04-24 20:23:39.000000000 -0400
@@ -331,10 +321,9 @@
_RWSTD_MEMBER_EXPORT const locale& operator= (const locale&) _THROWS (());
#===========================================================================#
-
---- stdcxx-4.2.1/include/loc/_messages.h 2008-04-24 20:23:39.000000000 -0400
-+++ stdcxx-4.2.1/include/loc/_messages.h 2011-01-07 18:08:43.842940113 -0500
-@@ -63,9 +63,15 @@
+--- stdcxx-4.2.1/include/loc/_messages.h 2008-04-24 17:23:39.000000000 -0700
++++ stdcxx-4.2.1/include/loc/_messages.h 2011-06-16 10:59:37.994304507 -0700
+@@ -63,9 +63,12 @@
_RWSTD_NAMESPACE (std) {
@@ -344,23 +333,20 @@
+public:
typedef int catalog;
+
-+ messages_base () { }
-+
-+protected:
-+ virtual ~messages_base () _THROWS(()) { }
++ virtual ~messages_base () { }
};
-@@ -102,6 +108,8 @@
+@@ -102,6 +105,8 @@
protected:
-+ virtual ~messages () _THROWS(()) { }
++ virtual ~messages () { }
+
virtual catalog do_open (const string&, const locale&) const;
virtual string_type do_get (catalog, int, int, const string_type&) const;
-@@ -128,6 +136,7 @@
+@@ -128,6 +133,7 @@
template <class _CharT>
class messages_byname: public messages<_CharT>
{
@@ -368,18 +354,17 @@
char _C_namebuf [32];
public:
-@@ -136,6 +145,10 @@
+@@ -136,6 +142,10 @@
: messages<_CharT>(__refs) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
+
+protected:
+
-+ virtual ~messages_byname () _THROWS(()) { }
++ virtual ~messages_byname () { }
};
} // namespace std
-
#===========================================================================#
--- stdcxx-4.2.1/include/loc/_money_get.h 2008-04-24 20:23:39.000000000 -0400
@@ -399,7 +384,7 @@
#endif // _RWSTD_NO_LONG_DOUBLE
-+ virtual ~money_get () _THROWS(()) { }
++ virtual ~money_get () { }
+
virtual iter_type
do_get (iter_type __it, iter_type __end, bool __intl, ios_base &__fl,
@@ -428,9 +413,9 @@
#===========================================================================#
---- stdcxx-4.2.1/include/loc/_moneypunct.h 2008-04-24 20:23:39.000000000 -0400
-+++ stdcxx-4.2.1/include/loc/_moneypunct.h 2011-01-07 18:33:27.698752664 -0500
-@@ -46,27 +46,35 @@
+--- stdcxx-4.2.1/include/loc/_moneypunct.h 2008-04-24 17:23:39.000000000 -0700
++++ stdcxx-4.2.1/include/loc/_moneypunct.h 2011-06-16 11:01:58.479524965 -0700
+@@ -46,27 +46,31 @@
_RWSTD_NAMESPACE (std) {
@@ -440,14 +425,10 @@
+class money_base
{
+public:
-+ money_base () { }
-+
enum part { none, space, symbol, sign, value };
struct pattern { char field [4]; };
+
-+protected:
-+
-+ virtual ~money_base () _THROWS (()) { }
++ virtual ~money_base () { }
};
@@ -470,27 +451,27 @@
char_type decimal_point () const {
return do_decimal_point ();
-@@ -110,6 +118,8 @@
+@@ -110,6 +114,8 @@
protected:
-+ virtual ~moneypunct () _THROWS(()) { }
++ virtual ~moneypunct () { }
+
// 22.2.6.3.1, p1
virtual char_type do_decimal_point () const {
return *_C_get (this, _RW::__rw_dp);
-@@ -211,6 +221,10 @@
+@@ -211,6 +217,10 @@
: moneypunct<_CharT, _Intl>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
+
+protected:
+
-+ virtual ~moneypunct_byname () _THROWS(()) { }
++ virtual ~moneypunct_byname () { }
};
-@@ -226,15 +240,15 @@
+@@ -226,15 +236,15 @@
#if _RWSTD_INSTANTIATE (_MONEYPUNCT, _CHAR)
@@ -510,12 +491,11 @@
#endif // _RWSTD_INSTANTIATE (_MONEYPUNCT, _WCHAR_T)
-@@ -247,3 +261,4 @@
+@@ -247,3 +257,4 @@
#endif // _RWSTD_LOC_MONEYPUNCT_H_INCLUDED
+
-
#===========================================================================#
--- stdcxx-4.2.1/include/loc/_money_put.h 2008-04-24 20:23:39.000000000 -0400
@@ -536,7 +516,7 @@
protected:
-+ virtual ~money_put () _THROWS (()) { }
++ virtual ~money_put () { }
+
// 22.2.6.2.2, p1
virtual iter_type
@@ -561,7 +541,7 @@
_EXPLICIT num_get (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
-+ virtual ~num_get() _THROWS(()) { }
++ virtual ~num_get() { }
+
#ifndef _RWSTD_NO_NATIVE_BOOL
@@ -611,7 +591,7 @@
protected:
-+ virtual ~numpunct () _THROWS(()) { }
++ virtual ~numpunct () { }
+
// 22.2.3.1.2, p1
virtual char_type do_decimal_point () const {
@@ -623,7 +603,7 @@
+
+protected:
+
-+ virtual ~numpunct_byname () _THROWS(()) { }
++ virtual ~numpunct_byname () { }
};
} // namespace std
@@ -653,7 +633,7 @@
template <class _CharT, class _OutputIter /* = ostreambuf_iterator<_CharT> */>
-/* virtual */ num_put<_CharT, _OutputIter>::~num_put ()
-+/* virtual */ num_put<_CharT, _OutputIter>::~num_put () _THROWS (())
++/* virtual */ num_put<_CharT, _OutputIter>::~num_put ()
{
// no-op
}
@@ -677,7 +657,7 @@
: _RW::__rw_facet (__refs) { }
- virtual ~num_put ();
-+ virtual ~num_put () _THROWS(());
++ virtual ~num_put ();
#ifndef _RWSTD_NO_BOOL
@@ -712,7 +692,7 @@
enum dateorder { no_order, dmy, mdy, ymd, ydm };
+
+ time_base() { }
-+ virtual ~time_base() _THROWS(()) { }
++ virtual ~time_base() { }
};
@@ -738,7 +718,7 @@
protected:
-+ virtual ~time_get () _THROWS(()) { }
++ virtual ~time_get () { }
+
virtual dateorder do_date_order() const {
return dateorder ();
@@ -749,7 +729,7 @@
}
+
+protected:
-+ virtual ~time_get_byname () _THROWS(()) { }
++ virtual ~time_get_byname () { }
};
} // namespace std
@@ -774,7 +754,7 @@
protected:
+ // 22.2.5.3
-+ virtual ~time_put() _THROWS(()) { }
++ virtual ~time_put() { }
+
// 22.2.5.3.2, p1
virtual iter_type
@@ -791,7 +771,7 @@
}
+
+protected:
-+ virtual ~time_put_byname() _THROWS(()) { }
++ virtual ~time_put_byname() { }
};
} // namespace std
@@ -827,7 +807,7 @@
-/* virtual */ codecvt<char, char, _RWSTD_MBSTATE_T>::~codecvt ()
+/* virtual */
-+codecvt<char, char, _RWSTD_MBSTATE_T>::~codecvt () _THROWS(())
++codecvt<char, char, _RWSTD_MBSTATE_T>::~codecvt ()
{
// no-op
}
@@ -836,7 +816,7 @@
}
+/* virtual */
-+codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::~codecvt () _THROWS(())
++codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::~codecvt ()
+{
+ // no-op
+}
@@ -859,7 +839,7 @@
-ctype<char>::~ctype ()
-+ctype<char>::~ctype () _THROWS (())
++ctype<char>::~ctype ()
{
if (_C_delete_it) {
delete[] _RWSTD_CONST_CAST (mask*, _C_mask_tab);
@@ -873,7 +853,7 @@
-ctype<wchar_t>::~ctype ()
-+ctype<wchar_t>::~ctype () _THROWS (())
++ctype<wchar_t>::~ctype ()
{
if (_C_delete_it) {
delete[] _RWSTD_CONST_CAST (mask*, _C_mask_tab);
@@ -883,7 +863,7 @@
-ctype_byname<wchar_t>::
-~ctype_byname ()
-+ctype_byname<wchar_t>::~ctype_byname () _THROWS (())
++ctype_byname<wchar_t>::~ctype_byname ()
{
// Release the codecvt database at this level
if (_C_cvtimpl != 0 && _C_cvtsize != 0)
@@ -906,7 +886,7 @@
+ explicit test_numpunct(size_t refs = 0)
+ : std::numpunct<charT> (refs) { }
+
-+ virtual ~test_numpunct () _THROWS (()) { }
++ virtual ~test_numpunct () { }
+};
+
/**************************************************************************/