Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 24949 invoked from network); 24 Jul 2007 15:08:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jul 2007 15:08:09 -0000 Received: (qmail 7005 invoked by uid 500); 24 Jul 2007 15:08:10 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 6986 invoked by uid 500); 24 Jul 2007 15:08: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 6975 invoked by uid 99); 24 Jul 2007 15:08:10 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jul 2007 08:08:10 -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; Tue, 24 Jul 2007 08:08:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 464851A981A; Tue, 24 Jul 2007 08:07:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r559076 - in /incubator/stdcxx/trunk/include: string string.cc Date: Tue, 24 Jul 2007 15:07:47 -0000 To: stdcxx-commits@incubator.apache.org From: faridz@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070724150748.464851A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faridz Date: Tue Jul 24 08:07:47 2007 New Revision: 559076 URL: http://svn.apache.org/viewvc?view=rev&rev=559076 Log: 2007-07-24 Farid Zaripov * string (replace): Corrected function name in _RWSTD_FUNC() macro. * string.cc (replace): Ditto. Modified: incubator/stdcxx/trunk/include/string incubator/stdcxx/trunk/include/string.cc Modified: incubator/stdcxx/trunk/include/string URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/string?view=diff&rev=559076&r1=559075&r2=559076 ============================================================================== --- incubator/stdcxx/trunk/include/string (original) +++ incubator/stdcxx/trunk/include/string Tue Jul 24 08:07:47 2007 @@ -1108,16 +1108,16 @@ { _RWSTD_REQUIRES (__pos1 <= size (), (_RWSTD_ERROR_OUT_OF_RANGE, - _RWSTD_FUNC ("basic_string::compare(size_type, " + _RWSTD_FUNC ("basic_string::replace(size_type, " "size_type, const basic_string&, " - "size_type, size_type) const"), + "size_type, size_type)"), __pos1, size ())); _RWSTD_REQUIRES (__pos2 <= __str.size (), (_RWSTD_ERROR_OUT_OF_RANGE, - _RWSTD_FUNC ("basic_string::compare(size_type, " + _RWSTD_FUNC ("basic_string::replace(size_type, " "size_type, const basic_string&, " - "size_type, size_type) const"), + "size_type, size_type)"), __pos2, __str.size ())); const size_type __rem = __str.size () - __pos2; Modified: incubator/stdcxx/trunk/include/string.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/string.cc?view=diff&rev=559076&r1=559075&r2=559076 ============================================================================== --- incubator/stdcxx/trunk/include/string.cc (original) +++ incubator/stdcxx/trunk/include/string.cc Tue Jul 24 08:07:47 2007 @@ -340,8 +340,7 @@ _RWSTD_REQUIRES (__pos1 <= __size0, (_RWSTD_ERROR_OUT_OF_RANGE, _RWSTD_FUNC ("basic_string::replace(size_type, size_type" - ", const_pointer, size_type, size_type, " - "size_type)"), + ", const_pointer, size_type)"), __pos1, __size0 > __n2 ? __size0 : __n2)); // number of characters to delete @@ -350,8 +349,7 @@ _RWSTD_REQUIRES (__size0 - __xlen <= max_size () - __n2, (_RWSTD_ERROR_LENGTH_ERROR, _RWSTD_FUNC ("basic_string::replace(size_type, size_type" - ", const_pointer, size_type, size_type, " - "size_type)"), + ", const_pointer, size_type)"), __size0 - __xlen, max_size() - __n2)); // compute the resulting string size