svn commit: r696209 - /stdcxx/branches/4.2.x/tests/localization/22.locale.synopsis.cpp

[faridz]

Author: faridz
Date: Wed Sep 17 02:06:47 2008
New Revision: 696209

URL: http://svn.apache.org/viewvc?rev=696209&view=rev
Log:
2008-09-17  Farid Zaripov  <[EMAIL PROTECTED]>

        * tests/localization/22.locale.synopsis.cpp (collate<UDC>): Resolved
        MSVC 7.1 warning C4099: 'std::collate<int>' : type name first seen
        using 'class' now seen using 'struct'.
        (CodecvtDerived<>::test_protected_members): Resolved MSVC errors
        C2248: 'std::codecvt<char,char,int>::do_out' : cannot access protected
        member declared in class 'std::codecvt<char,char,int>'.

Modified:
    stdcxx/branches/4.2.x/tests/localization/22.locale.synopsis.cpp

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.synopsis.cpp
URL: 
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.synopsis.cpp?rev=696209&r1=696208&r2=696209&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.synopsis.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.synopsis.cpp Wed Sep 17 
02:06:47 2008
@@ -480,8 +480,9 @@
 
 // class template specialization for UDC type
 _RWSTD_SPECIALIZED_CLASS
-struct collate<UDC>: locale::facet
+class collate<UDC>: public locale::facet
 {
+public:
     typedef UDC                                 char_type;
     typedef StringTypes<char_type>::string_type string_type;
 
@@ -1000,7 +1001,7 @@
 template <class charT>
 struct CodecvtDerived: std::codecvt<charT, char, std::mbstate_t>
 {
-    typedef std::codecvt<charT, char, std::mbstate_t> Codecvt;
+    typedef CodecvtDerived<charT>                     Codecvt;
     typedef std::codecvt_base::result                 Result;
     typedef typename Codecvt::intern_type             InternT;
     typedef typename Codecvt::extern_type             ExternT;