stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r418425 - /incubator/stdcxx/trunk/tests/src/21.strings.cpp
Date Sat, 01 Jul 2006 00:33:53 GMT
Author: sebor
Date: Fri Jun 30 17:33:53 2006
New Revision: 418425

URL: http://svn.apache.org/viewvc?rev=418425&view=rev
Log:
2006-06-30  Martin Sebor  <sebor@roguewave.com>

	* 21.strings.cpp (_rw_setvars): Formatted the (initial)
	contents of the string argument to string I/O functions.

Modified:
    incubator/stdcxx/trunk/tests/src/21.strings.cpp

Modified: incubator/stdcxx/trunk/tests/src/21.strings.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/src/21.strings.cpp?rev=418425&r1=418424&r2=418425&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/src/21.strings.cpp (original)
+++ incubator/stdcxx/trunk/tests/src/21.strings.cpp Fri Jun 30 17:33:53 2006
@@ -591,7 +591,7 @@
         // for non-members append just the function name here
         // the class name will inserted below during argument
         // formatting
-        rw_asnprintf (&buf, &bufsize, "%{$FUNC} ");
+        rw_asnprintf (&buf, &bufsize, "%{$FUNC}");
     }
 
     // compute the end offsets for convenience
@@ -1046,17 +1046,20 @@
     case StringIds::extractor_istream_str:
     case StringIds::getline_istream_str:
         rw_asnprintf (&buf, &bufsize,
-                      "%{+} (%{$ISTREAM}&, %{$CLASS}&)");
+                      "%{+} (%{$ISTREAM}&, %{$CLASS}(%{?}%{#*s}%{;}))",
+                      0 < str_len, int (str_len), str);
         break;
 
     case StringIds::getline_istream_str_val:
         rw_asnprintf (&buf, &bufsize,
-                      "%{+} (%{$ISTREAM}&, %{$CLASS}&, %{#c})", pcase->val);
+                      "%{+} (%{$ISTREAM}&, %{$CLASS}(%{?}%{#*s}%{;}), %{#c})",
+                      0 < str_len, int (str_len), str, pcase->val);
         break;
 
     case StringIds::inserter_ostream_cstr:
         rw_asnprintf (&buf, &bufsize,
-                      "%{+} (%{$OSTREAM}&, const %{$CLASS}&)");
+                      "%{+} (%{$OSTREAM}&, %{$CLASS}(%{?}%{#*s}%{;}))",
+                      0 < str_len, int (str_len), str);
         break;
 
     case StringIds::resize_size_val:



Mime
View raw message