git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inserters_extractors.cc, [...]: Replace multi-line string constants with C89-style concatenated string constants. 

2001-05-15  Zack Weinberg  <zackw@stanford.edu>

        * testsuite/21_strings/inserters_extractors.cc,
        testsuite/27_io/istream_unformatted.cc,
        testsuite/27_io/stringstream.cc:
        Replace multi-line string constants with C89-style
        concatenated string constants.

From-SVN: r42116
This commit is contained in:
Zack Weinberg 2001-05-15 20:46:50 +00:00 committed by Benjamin Kosnik
parent c53c4afc0a
commit 7edc73b46a
4 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2001-05-15 Zack Weinberg <zackw@stanford.edu>
* testsuite/21_strings/inserters_extractors.cc,
testsuite/27_io/istream_unformatted.cc,
testsuite/27_io/stringstream.cc:
Replace multi-line string constants with C89-style
concatenated string constants.
2001-05-14 Richard Henderson <rth@redhat.com> 2001-05-14 Richard Henderson <rth@redhat.com>
* mknumeric_limits: Build with -fno-exceptions. * mknumeric_limits: Build with -fno-exceptions.

5
libstdc++-v3/testsuite/21_strings/inserters_extractors.cc
View File

@ -41,9 +41,8 @@ bool test01(void)
csize_type npos = std::string::npos; csize_type npos = std::string::npos;
csize_type csz01, csz02; csize_type csz01, csz02;
// { dg-warning "string literals" "" { xfail *-*-* } 45 } const std::string str01("sailing grand traverse bay\n"
const std::string str01("sailing grand traverse bay "\t\t\t from Elk Rapids to the point reminds me of miles");
from Elk Rapids to the point reminds me of miles");
const std::string str02("sailing"); const std::string str02("sailing");
const std::string str03("grand"); const std::string str03("grand");
const std::string str04("traverse"); const std::string str04("traverse");

58
libstdc++-v3/testsuite/27_io/istream_unformatted.cc
View File

@ -142,11 +142,13 @@ test02()
typedef std::char_traits<char> traits_type; typedef std::char_traits<char> traits_type;
bool test = true; bool test = true;
// { dg-warning "string literals" "" { xfail *-*-* } 146 } const char str_lit01[] = "\t\t\t sun*ra \n"
const char str_lit01[] = " sun*ra " "
and his myth science arkestra present "and his myth science arkestra present\n"
angles and demons @ play " "
the nubians of plutonia"; "angles and demons @ play\n"
" "
"the nubians of plutonia";
std::string str01(str_lit01); std::string str01(str_lit01);
std::string strtmp; std::string strtmp;
@ -201,8 +203,9 @@ test02()
VERIFY( is_04.gcount() == 64 ); VERIFY( is_04.gcount() == 64 );
VERIFY( state1 != state2 ); VERIFY( state1 != state2 );
VERIFY( state2 == statefail ); VERIFY( state2 == statefail );
// { dg-warning "string literals" "" { xfail *-*-* } 205 } VERIFY( !traits_type::compare(
VERIFY( !traits_type::compare(" and his myth science arkestra presen", carray1, 65) ); " and his myth science arkestra presen",
carray1, 65) );
is_04.clear(); is_04.clear();
state1 = is_04.rdstate(); state1 = is_04.rdstate();
@ -234,10 +237,11 @@ test03()
typedef std::char_traits<char> traits_type; typedef std::char_traits<char> traits_type;
bool test = true; bool test = true;
// { dg-warning "string literals" "" { xfail *-*-* } 238 } const char str_lit01[] =
const char str_lit01[] = " sun*ra " sun*ra \n\t\t\t & his arkestra, featuring john gilmore: \n"
& his arkestra, featuring john gilmore: " "
jazz in silhouette: images and forecasts of tomorrow"; "jazz in silhouette: images and forecasts of tomorrow";
std::string str01(str_lit01); std::string str01(str_lit01);
std::string strtmp; std::string strtmp;
@ -360,23 +364,21 @@ test04()
int int
test05() test05()
{ {
// { dg-warning "string literals" "" { xfail *-*-* } 364 } const char* charray = "\n"
const char* charray = " "a\n"
a "aa\n"
aa "aaa\n"
aaa "aaaa\n"
aaaa "aaaaa\n"
aaaaa "aaaaaa\n"
aaaaaa "aaaaaaa\n"
aaaaaaa "aaaaaaaa\n"
aaaaaaaa "aaaaaaaaa\n"
aaaaaaaaa "aaaaaaaaaa\n"
aaaaaaaaaa "aaaaaaaaaaa\n"
aaaaaaaaaaa "aaaaaaaaaaaa\n"
aaaaaaaaaaaa "aaaaaaaaaaaaa\n"
aaaaaaaaaaaaa "aaaaaaaaaaaaaa\n";
aaaaaaaaaaaaaa
";
bool test = true; bool test = true;
const std::streamsize it = 5; const std::streamsize it = 5;

5
libstdc++-v3/testsuite/27_io/stringstream.cc
View File

@ -48,9 +48,8 @@ test01()
VERIFY( len == 0 ); VERIFY( len == 0 );
// Full string sanity check. // Full string sanity check.
// { dg-warning "string literals" "" { xfail *-*-* } 52 } std::string str02("these golden days, i spend waiting for you:\n"
std::string str02("these golden days, i spend waiting for you:\n "Betty Carter on Verve with I'm Yours and You're Mine.");
Betty Carter on Verve with I'm Yours and You're Mine.");
__i_start = str02.begin(); __i_start = str02.begin();
__i_end = str02.end(); __i_end = str02.end();
len = str02.size(); len = str02.size();