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 <Farid_Zaripov@epam.com>

	* 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