Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 88587 invoked from network); 2 Apr 2007 23:25:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Apr 2007 23:25:02 -0000 Received: (qmail 55102 invoked by uid 500); 2 Apr 2007 23:25:10 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 55089 invoked by uid 500); 2 Apr 2007 23:25:10 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 55074 invoked by uid 99); 2 Apr 2007 23:25:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2007 16:25:09 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2007 16:25:02 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id DCFE61A9838; Mon, 2 Apr 2007 16:24:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524967 - /incubator/stdcxx/trunk/tests/iostream/27.ostream.cpp Date: Mon, 02 Apr 2007 23:24:41 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070402232441.DCFE61A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebor Date: Mon Apr 2 16:24:41 2007 New Revision: 524967 URL: http://svn.apache.org/viewvc?view=rev&rev=524967 Log: 2007-04-02 Martin Sebor * 27.ostream.cpp (test_formatted): Corrected wide character format directives. Modified: incubator/stdcxx/trunk/tests/iostream/27.ostream.cpp Modified: incubator/stdcxx/trunk/tests/iostream/27.ostream.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/iostream/27.ostream.cpp?view=diff&rev=524967&r1=524966&r2=524967 ============================================================================== --- incubator/stdcxx/trunk/tests/iostream/27.ostream.cpp (original) +++ incubator/stdcxx/trunk/tests/iostream/27.ostream.cpp Mon Apr 2 16:24:41 2007 @@ -1,21 +1,28 @@ /*************************************************************************** * - * ostream.cpp - test exercising class template basic_ostream + * 27.ostream.cpp - test exercising class template basic_ostream * * $Id$ * *************************************************************************** * - * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave - * Software division. Licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. Unless required by - * applicable law or agreed to in writing, software distributed under - * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License - * for the specific language governing permissions and limitations under - * the License. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + * + * Copyright 2002-2006 Rogue Wave Software. * **************************************************************************/ @@ -759,14 +766,14 @@ cbuf [i] = char (charbuf [i]); rw_assert (0 == std::strcmp (cbuf, str), __FILE__, line1, - "%d. std::basic_ostream<%s>::operator<<(%s = %{#wc}) " + "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc}) " "inserted \"%s\", expected \"%s\"", line2, cname, tname, cbuf, str); } // verify that stream is in the expected state rw_assert (rdstate == os.rdstate (), __FILE__, line1, - "%d. std::basic_ostream<%s>::operator<<(%s = %{#wc})" + "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc})" ".rdstate() == %{Is}, got %{Is}", line2, cname, tname, val, rdstate, os.rdstate ()); @@ -779,7 +786,7 @@ !((!exceptions || !tsb.fails_ && !tnp.fails_) && os.width ()); rw_assert (pass, __FILE__, line1, - "%d. std::basic_ostream<%s>::operator<<(%s = %{#wc})" + "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc})" ".width () == 0, got %d", line2, cname, tname, val, os.width ()); @@ -788,7 +795,7 @@ pass = !(exceptions & os.rdstate () && caught != E_failure); rw_assert (pass, __FILE__, line1, - "%d. std::basic_ostream<%s>::operator<<(%s = %{#wc}) " + "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc}) " "set %{Is} but failed to throw ios_base::failure " "when the same bit is set in exceptions", line2, cname, tname, val, rdstate); @@ -803,14 +810,14 @@ if (exceptions & Bad && caught != tsb.throws_) { rw_assert (false, __FILE__, line1, - "%d. std::basic_ostream<%s>::operator<<(%s = %{#wc}) " + "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc}) " "failed to propagate an exception thrown by " "basic_filebuf; caught %s instead", line2, cname, tname, val, caught_what); } else { rw_assert ((exceptions & Bad) || !caught, 0, line1, - "%d. std::basic_ostream<%s>::operator<<(%s = %{#wc}) " + "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc}) " "propagated an exception thrown by basic_filebuf " "when ios_base::badbit is clear in exceptions", line2, cname, tname, val); @@ -825,13 +832,13 @@ // been thrown if exceptions is clear if (exceptions & Bad) rw_assert (caught == tnp.throws_, 0, line1, - "%d. std::basic_ostream<%s>::operator<<(%s = %{#wc}) " + "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc}) " "failed to propagate exception thrown by " "basic_filebuf; caught %s instead", line2, cname, tname, val, caught_what); else rw_assert (!caught, __FILE__, line1, - "%d. std::basic_ostream<%s>::operator<<(%s = %{#wc}) " + "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc}) " "propagated an exception thrown by basic_filebuf" "when ios_base::badbit is clear in exceptions", line2, cname, tname, val);