Return-Path: 
 <commits-return-3477-apmail-stdcxx-commits-archive=stdcxx.apache.org@stdcxx.apache.org>
Delivered-To: apmail-stdcxx-commits-archive@www.apache.org
Received: (qmail 94129 invoked from network); 17 Sep 2008 09:07:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 17 Sep 2008 09:07:44 -0000
Received: (qmail 76538 invoked by uid 500); 17 Sep 2008 09:07:37 -0000
Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org
Received: (qmail 76501 invoked by uid 500); 17 Sep 2008 09:07:37 -0000
Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@stdcxx.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@stdcxx.apache.org>
List-Post: <mailto:commits@stdcxx.apache.org>
List-Id: <commits.stdcxx.apache.org>
Reply-To: dev@stdcxx.apache.org
Delivered-To: mailing list commits@stdcxx.apache.org
Received: (qmail 76443 invoked by uid 99); 17 Sep 2008 09:07:37 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2008 02:07:37 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2008 09:06:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C1F8723889E9; Wed, 17 Sep 2008 02:06:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r696209 -
 /stdcxx/branches/4.2.x/tests/localization/22.locale.synopsis.cpp
Date: Wed, 17 Sep 2008 09:06:49 -0000
To: commits@stdcxx.apache.org
From: faridz@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080917090649.C1F8723889E9@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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  <faridz@apache.org>

	* 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;