summaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite/22_locale/time_get/get_year
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2004-11-19 21:48:21 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2004-11-19 21:48:21 +0000
commit64c5d1fd998eaf2afcda722f6d0a140534070698 (patch)
tree30130e1bfffe2c4717a2519d26b1f27a0a686a22 /libstdc++-v3/testsuite/22_locale/time_get/get_year
parent1dcec9182a50a608acf9955a33d1b1098b7eacbe (diff)
downloadgcc-64c5d1fd998eaf2afcda722f6d0a140534070698.tar.gz
2004-11-19 Paolo Carlini <pcarlini@suse.de>
* testsuite/22_locale/time_get/get_date/char/1.cc: In the checks use, more correctly (and consistently with other testcases) the return value of the facet (the iterator arguments are by value). * testsuite/22_locale/time_get/get_date/char/12791.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/12791.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_year/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_year/wchar_t/1.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90938 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/time_get/get_year')
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc15
-rw-r--r--libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc15
2 files changed, 18 insertions, 12 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
index e558cbad760..98c009c776f 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
@@ -65,29 +65,32 @@ void test01()
iterator_type is_it02(iss);
tm time02;
errorstate = good;
- tim_get.get_year(is_it02, end, iss, errorstate, &time02);
+ iterator_type ret02 = tim_get.get_year(is_it02, end, iss, errorstate,
+ &time02);
VERIFY( time02.tm_year == time_bday.tm_year );
VERIFY( errorstate == good );
- VERIFY( *is_it02 == ' ');
+ VERIFY( *ret02 == ' ' );
iss.str("197d1 ");
iterator_type is_it03(iss);
tm time03;
time03.tm_year = 3;
errorstate = good;
- tim_get.get_year(is_it03, end, iss, errorstate, &time03);
+ iterator_type ret03 = tim_get.get_year(is_it03, end, iss, errorstate,
+ &time03);
VERIFY( time03.tm_year == 3 );
VERIFY( errorstate == ios_base::failbit );
- VERIFY( *is_it03 == 'd');
+ VERIFY( *ret03 == 'd' );
iss.str("71d71");
iterator_type is_it04(iss);
tm time04;
errorstate = good;
- tim_get.get_year(is_it04, end, iss, errorstate, &time04);
+ iterator_type ret04 = tim_get.get_year(is_it04, end, iss, errorstate,
+ &time04);
VERIFY( time04.tm_year == time_bday.tm_year );
VERIFY( errorstate == good );
- VERIFY( *is_it03 == 'd');
+ VERIFY( *ret04 == 'd' );
iss.str("71");
iterator_type is_it05(iss);
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
index 07249303a5a..876e57be83a 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc
@@ -65,29 +65,32 @@ void test01()
iterator_type is_it02(iss);
tm time02;
errorstate = good;
- tim_get.get_year(is_it02, end, iss, errorstate, &time02);
+ iterator_type ret02 = tim_get.get_year(is_it02, end, iss, errorstate,
+ &time02);
VERIFY( time02.tm_year == time_bday.tm_year );
VERIFY( errorstate == good );
- VERIFY( *is_it02 == L' ' );
+ VERIFY( *ret02 == L' ' );
iss.str(L"197d1 ");
iterator_type is_it03(iss);
tm time03;
time03.tm_year = 3;
errorstate = good;
- tim_get.get_year(is_it03, end, iss, errorstate, &time03);
+ iterator_type ret03 = tim_get.get_year(is_it03, end, iss, errorstate,
+ &time03);
VERIFY( time03.tm_year == 3 );
VERIFY( errorstate == ios_base::failbit );
- VERIFY( *is_it03 == L'd' );
+ VERIFY( *ret03 == L'd' );
iss.str(L"71d71");
iterator_type is_it04(iss);
tm time04;
errorstate = good;
- tim_get.get_year(is_it04, end, iss, errorstate, &time04);
+ iterator_type ret04 = tim_get.get_year(is_it04, end, iss, errorstate,
+ &time04);
VERIFY( time04.tm_year == time_bday.tm_year );
VERIFY( errorstate == good );
- VERIFY( *is_it03 == L'd' );
+ VERIFY( *ret04 == L'd' );
iss.str(L"71");
iterator_type is_it05(iss);