--- 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-23 11:56:07.510860582 -0700

@@ -48,9 +48,12 @@

 // 22.2.1.5 - Template class codecvt

-struct codecvt_base

+class codecvt_base

 {

+public:

     enum result { ok, partial, error, noconv };

+

+    virtual ~codecvt_base () { }

 };

@@ -73,6 +76,8 @@

 protected:

+    virtual ~codecvt ();

+

     // extension: where reasonable, the default behavior of the primary

     // template is the same as that of codecvt<char, char, mbstate_t> if

     // sizeof (intern_type) == sizeof (extern_type) to allow iostream

@@ -188,8 +193,6 @@

     _EXPLICIT codecvt (_RWSTD_SIZE_T = 0);

-    virtual ~codecvt ();

-

     result out (state_type &__state,

                 const intern_type *__from, const intern_type* __from_end,

                 const intern_type *&__from_next,

@@ -234,6 +237,8 @@

 protected:

+    virtual ~codecvt ();

+

     virtual result

     do_out (state_type&,

             const intern_type*, const intern_type*, const intern_type*&,

@@ -303,6 +308,8 @@

 protected:

+    virtual ~codecvt ();

+

     virtual result

     do_out (state_type&, const intern_type*, const intern_type*,

             const intern_type*&,

@@ -398,6 +405,11 @@

         : codecvt <_InternT, _ExternT, _StateT> (__ref) {

         this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);

     }

+

+protected:

+

+    virtual ~codecvt_byname () { }

+

 };

@@ -417,6 +429,8 @@

 protected:

+    virtual ~codecvt_byname () { }

+

     virtual codecvt_base::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

+++ stdcxx-4.2.1/include/loc/_collate.h	2011-01-07 18:26:19.591751655 -0500

@@ -86,6 +86,8 @@

 protected:

+    virtual ~collate () { }

+

     // protected virtual members are not defined

     virtual int

     do_compare (const char_type*, const char_type*,

@@ -133,6 +135,8 @@

 protected:

+    virtual ~collate () { }

+

     virtual int

     do_compare (const char_type*, const char_type*,

                 const char_type*, const char_type*) const;

@@ -179,6 +183,7 @@

 protected:

+    virtual ~collate () { }

     virtual int

     do_compare (const char_type*, const char_type*,

                 const char_type*, const char_type*) const;

@@ -204,6 +209,10 @@

         : collate<_CharT>(__ref) {

         this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);

     }

+

+protected:

+

 };

@@ -220,6 +229,8 @@

 protected:

+    virtual ~collate_byname() { }

+

     virtual int

     do_compare (const char_type*, const char_type*,

                 const char_type*, const char_type*) const;

@@ -244,6 +255,8 @@

 protected:

+    virtual ~collate_byname () { }

+

     virtual int

     do_compare (const char_type*, const char_type*,

                 const char_type*, const char_type*) const;

@@ -263,3 +276,4 @@

 #endif   // _RWSTD_LOC_COLLATE_H_INCLUDED

+

#===========================================================================#

--- 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-23 12:55:19.000540849 -0700

@@ -64,11 +64,12 @@

 _RWSTD_NAMESPACE (std) { 

-struct _RWSTD_CLASS_EXPORT locale;

+class _RWSTD_CLASS_EXPORT locale;

 // 22.2.1

-struct _RWSTD_EXPORT ctype_base

+class _RWSTD_EXPORT ctype_base

 {

+public:

     // 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 +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);

+

+    virtual ~ctype_base () { }

 };

@@ -103,7 +106,8 @@

     typedef _CharT char_type;

     _EXPLICIT ctype (_RWSTD_SIZE_T __ref = 0)

-        : _RW::__rw_facet (__ref) { }

+        : _RW::__rw_facet (__ref),

+   		ctype_base () 	{ }

     // 22.2.1.1.1, p1

@@ -171,6 +175,8 @@

 protected:

+    virtual ~ctype() { }

+

     // 22.2.1.1.2, p1

     virtual bool do_is (mask, char_type) const {

         return false;

@@ -286,14 +292,14 @@

 protected:

+    virtual ~ctype ();

+

     const mask* table () const _THROWS (()) {

         return _C_mask_tab;

     }

     static const mask* classic_table () _THROWS (());

-    virtual ~ctype ();

-

     virtual const char_type*

     do_toupper (char_type*, const char_type*) const;

@@ -394,6 +400,10 @@

         : ctype<_CharT>(__ref) {

         this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);

     }

+

+protected:

+

+    virtual ~ctype_byname () { }

 };

@@ -405,6 +415,10 @@

 public:

     _EXPLICIT ctype_byname (const char*, _RWSTD_SIZE_T = 0);

+

+protected:

+

+    virtual ~ctype_byname () { }

 };

@@ -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

+++ stdcxx-4.2.1/include/loc/_facet.h	2011-01-07 14:25:25.827689177 -0500

@@ -39,19 +39,20 @@

 _RWSTD_NAMESPACE (std) { 

-struct _RWSTD_CLASS_EXPORT locale;

+class _RWSTD_CLASS_EXPORT locale;

 }   // namespace std

 _RWSTD_NAMESPACE (__rw) { 

-class _RWSTD_EXPORT __rw_locale;

+class _RWSTD_CLASS_EXPORT __rw_locale;

 struct __rw_access;

-struct _RWSTD_EXPORT __rw_facet: __rw_synchronized

+class _RWSTD_CLASS_EXPORT __rw_facet : public __rw_synchronized

 {

+public:

     // the type of a "constructor" function used to create facet objects

     // of standard types by the library

     typedef __rw_facet* (_C_ctor_t)(_RWSTD_SIZE_T, const char*);

@@ -225,15 +226,16 @@

     static __rw_facet*

     _C_manage (__rw_facet*, _C_facet_type, const char*, _C_ctor_t*);

-    friend struct _STD::locale;

+    friend class _STD::locale;

     friend class __rw_locale;

     friend struct __rw_facet_id;

     friend struct __rw_access;

 };

-struct _RWSTD_EXPORT __rw_facet_id

+class _RWSTD_EXPORT __rw_facet_id

 {

+public:

 #ifdef _RWSTD_NO_SPECIALIZED_FACET_ID

     __rw_facet_id () {

#===========================================================================#

--- stdcxx-4.2.1/include/loc/_locale.h	2008-04-24 20:23:39.000000000 -0400

+++ stdcxx-4.2.1/include/loc/_locale.h	2011-01-07 14:37:52.736687266 -0500

@@ -119,36 +119,37 @@

 class ctype;

 _EXPORT template <class _CharT, class _Iter>

-struct money_get;

+class money_get;

 _EXPORT template <class _CharT, class _Iter>

-struct money_put;

+class money_put;

 _EXPORT template <class _CharT, bool _Intl>

-struct moneypunct;

+class moneypunct;

 _EXPORT template <class _CharT, class _Iter>

-struct num_get;

+class num_get;

 _EXPORT template <class _CharT, class _Iter>

-struct num_put;

+class num_put;

 _EXPORT template <class _CharT>

-struct numpunct;

+class numpunct;

 _EXPORT template <class _CharT, class _Iter>

 class time_get;

 _EXPORT template <class _CharT, class _Iter>

-struct time_put;

+class time_put;

 _EXPORT template <class _CharT>

 class messages;

 // 22.1.1

-struct _RWSTD_CLASS_EXPORT locale

+class _RWSTD_CLASS_EXPORT locale

 {

+public:

     // 22.1.1.1.1, p1

     typedef int category;

@@ -251,12 +252,11 @@

 #endif   // _RWSTD_NO_MEMBER_TEMPLATES

-

     // 22.1.1.2, p14

     _RWSTD_MEMBER_EXPORT locale (const locale&, const locale&, category);

     // 22.1.1.2, p16

-    _RWSTD_MEMBER_EXPORT ~locale() _THROWS (());

+    _RWSTD_MEMBER_EXPORT virtual ~locale() _THROWS (());

     // 22.1.1.2, p4

     _RWSTD_MEMBER_EXPORT const locale& operator= (const locale&) _THROWS (());

#===========================================================================#

--- 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) { 

-struct _RWSTD_EXPORT messages_base

+class _RWSTD_EXPORT messages_base

 {

+public:

     typedef int catalog;

+

+    virtual ~messages_base () { }

 };

@@ -102,6 +105,8 @@

 protected:

+    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 +133,7 @@

 template <class _CharT>

 class messages_byname: public messages<_CharT>

 {

+public:

     char _C_namebuf [32];

 public:

@@ -136,6 +142,10 @@

         : messages<_CharT>(__refs) {

         this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);

     }

+

+protected:

+

+    virtual ~messages_byname () { }

 };

 }   // namespace std

#===========================================================================#

--- stdcxx-4.2.1/include/loc/_money_get.h	2008-04-24 20:23:39.000000000 -0400

+++ stdcxx-4.2.1/include/loc/_money_get.h	2011-01-07 18:30:40.252939791 -0500

@@ -50,8 +50,9 @@

 _EXPORT

 template <class _CharT, class _InputIter = istreambuf_iterator<_CharT> >

-struct money_get: _RW::__rw_facet

+class money_get : public _RW::__rw_facet

 {

+public:

     typedef _CharT     char_type;

     typedef _InputIter iter_type;

     typedef

@@ -95,6 +96,8 @@

 #endif   // _RWSTD_NO_LONG_DOUBLE

+	virtual ~money_get () { }

+

     virtual iter_type

     do_get (iter_type __it, iter_type __end, bool __intl, ios_base &__fl,

             _RWSTD_IOSTATE &__err, string_type &__str) const {

@@ -134,13 +137,13 @@

 #if _RWSTD_INSTANTIATE (_MONEY_GET, _CHAR)

-_RWSTD_INSTANTIATE_1 (struct _RWSTD_TI_EXPORT money_get<char>);

+_RWSTD_INSTANTIATE_1 (class _RWSTD_TI_EXPORT money_get<char>);

 #endif   // _RWSTD_INSTANTIATE (_MONEY_GET, _CHAR)

 #if _RWSTD_INSTANTIATE (_MONEY_GET, _WCHAR_T)

-_RWSTD_INSTANTIATE_1 (struct _RWSTD_TI_EXPORT money_get<wchar_t>);

+_RWSTD_INSTANTIATE_1 (class _RWSTD_TI_EXPORT money_get<wchar_t>);

 #endif   // _RWSTD_INSTANTIATE (_MONEY_GET, _WCHAR_T)

@@ -153,3 +156,4 @@

 #endif   // _RWSTD_LOC_MONEY_GET_H_INCLUDED

+

#===========================================================================#

--- 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) { 

-

 // 22.2.6.3

-struct money_base

+class money_base

 {

+public:

     enum part { none, space, symbol, sign, value };

     struct pattern { char field [4]; };

+

+    virtual ~money_base () { }

 };

 // 22.2.6.3

 _EXPORT

 template <class _CharT, bool _Intl = false>

-struct moneypunct: _RW::__rw_facet, public money_base

+class moneypunct : public _RW::__rw_facet, public money_base

 {

+public:

     typedef _CharT char_type;

     typedef

     basic_string<char_type, char_traits<char_type>, allocator<char_type> >

     string_type;

     _EXPLICIT moneypunct (_RWSTD_SIZE_T __refs = 0)

-        : _RW::__rw_facet (__refs) { }

+        : _RW::__rw_facet (__refs),

+		money_base () { }

     char_type decimal_point () const {

         return do_decimal_point ();

@@ -110,6 +114,8 @@

 protected:

+    virtual ~moneypunct () { }

+

     // 22.2.6.3.1, p1

     virtual char_type do_decimal_point () const {

         return *_C_get (this, _RW::__rw_dp);

@@ -211,6 +217,10 @@

         : moneypunct<_CharT, _Intl>(__ref) {

             this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);

         }

+

+protected:

+

+    virtual ~moneypunct_byname () { }

 };

@@ -226,15 +236,15 @@

 #if _RWSTD_INSTANTIATE (_MONEYPUNCT, _CHAR)

-_RWSTD_INSTANTIATE_2 (struct _RWSTD_TI_EXPORT moneypunct<char, true>);

-_RWSTD_INSTANTIATE_2 (struct _RWSTD_TI_EXPORT moneypunct<char, false>);

+_RWSTD_INSTANTIATE_2 (class _RWSTD_TI_EXPORT moneypunct<char, true>);

+_RWSTD_INSTANTIATE_2 (class _RWSTD_TI_EXPORT moneypunct<char, false>);

 #endif   // _RWSTD_INSTANTIATE (_MONEYPUNCT, _CHAR)

 #if _RWSTD_INSTANTIATE (_MONEYPUNCT, _WCHAR_T)

-_RWSTD_INSTANTIATE_2 (struct _RWSTD_TI_EXPORT moneypunct<wchar_t, true>);

-_RWSTD_INSTANTIATE_2 (struct _RWSTD_TI_EXPORT moneypunct<wchar_t, false>);

+_RWSTD_INSTANTIATE_2 (class _RWSTD_TI_EXPORT moneypunct<wchar_t, true>);

+_RWSTD_INSTANTIATE_2 (class _RWSTD_TI_EXPORT moneypunct<wchar_t, false>);

 #endif   // _RWSTD_INSTANTIATE (_MONEYPUNCT, _WCHAR_T)

@@ -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

+++ stdcxx-4.2.1/include/loc/_money_put.h	2011-01-07 18:31:43.278708402 -0500

@@ -51,8 +51,10 @@

 // 22.2.6.2

 _EXPORT

 template <class _CharT, class _OutputIter = ostreambuf_iterator<_CharT> >

-struct money_put: _RW::__rw_facet

+class money_put : public _RW::__rw_facet