Author: sebor
Date: Thu Jun 1 17:09:08 2006
New Revision: 411004
URL: http://svn.apache.org/viewvc?rev=411004&view=rev
Log:
2006-06-01 Martin Sebor <[EMAIL PROTECTED]>
* 21.strings.cpp (_rw_setvars): Corercted the syntax of setenv
directives.
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=411004&r1=411003&r2=411004&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/src/21.strings.cpp (original)
+++ incubator/stdcxx/trunk/tests/src/21.strings.cpp Thu Jun 1 17:09:08 2006
@@ -369,13 +369,13 @@
// variables to the name of the character type and the
// Traits and Allocator specializations
rw_putenv ("charT=");
- rw_fprintf (0, "%{charT:=*}", _rw_char_names [func.char_id_]);
+ rw_fprintf (0, "%{$charT:=*}", _rw_char_names [func.char_id_]);
rw_putenv ("Traits=");
- rw_fprintf (0, "%{Traits:=*}", _rw_traits_names [func.traits_id_]);
+ rw_fprintf (0, "%{$Traits:=*}", _rw_traits_names [func.traits_id_]);
rw_putenv ("Allocator=");
- rw_fprintf (0, "%{Allocator:=*}", _rw_alloc_names [func.alloc_id_]);
+ rw_fprintf (0, "%{$Allocator:=*}", _rw_alloc_names [func.alloc_id_]);
// set the {CLASS}, {FUNC}, and {FUNCSIG} environment variables
// to the name of the specialization of the template, the name
@@ -383,6 +383,7 @@
// string function, respectively, when no test case is given
if ( StringIds::DefaultTraits == func.traits_id_
+ && StringIds::DefaultAlloc == func.alloc_id_
&& ( StringIds::Char == func.char_id_
|| StringIds::WChar == func.char_id_)) {
// format std::string and std::wstring
@@ -1243,7 +1244,8 @@
_rw_setvars (func);
// determine whether the function is a member function
- const bool is_member = 0 != (StringIds::bit_member &
test.which);
+ const bool is_member =
+ 0 != (StringIds::bit_member & test.which);
// compute the function overload's 0-based index
const size_t siginx = _rw_get_func_inx (test.which);
