2006-02-23 Benjamin Kosnik <bkoz@redhat.com>

	* testsuite/22_locale/codecvt/in/wchar_t/1.cc (test01): Change int
	to size_t. Use explicit static_cast for casts.
	* testsuite/22_locale/codecvt/in/wchar_t/6.cc (test06): Same.
	* testsuite/22_locale/codecvt/in/wchar_t/5.cc (test05): Same.
	* testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc (test01): Same.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111393 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9a89e5b..cc8b6b2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,7 +1,15 @@
+2006-02-23  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * testsuite/22_locale/codecvt/in/wchar_t/1.cc (test01): Change int
+       to size_t. Use explicit static_cast for casts.
+       * testsuite/22_locale/codecvt/in/wchar_t/6.cc (test06): Same.
+       * testsuite/22_locale/codecvt/in/wchar_t/5.cc (test05): Same.
+       * testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc (test01): Same.
+       
 2006-02-22  Paolo Carlini  <pcarlini@suse.de>
 
-       * docs/html/ext/pb_assoc/basic_tree_assoc_cntnr_const_node_iterator.html:
-       Fix links
+       * docs/html/ext/pb_assoc/
+       basic_tree_assoc_cntnr_const_node_iterator.html:Fix links
        * docs/html/ext/pb_assoc/basic_tree_assoc_cntnr_node_iterator.html:
        Likewise.
        * docs/html/ext/pb_assoc/hash_based_containers.html: Likewise.

diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/1.cc
index cd9d1f7..c75e4a8 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/1.cc
@@ -1,6 +1,6 @@
 // 2000-08-17 Benjamin Kosnik <bkoz@cygnus.com>
 
-// Copyright (C) 2000, 2002, 2003 Free Software Foundation
+// Copyright (C) 2000, 2002, 2003, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -53,11 +53,11 @@ void test01()
   const ext_type*      e_lit = "black pearl jasmine tea";
   const ext_type*       efrom_next;
   const int_type*      i_lit = L"black pearl jasmine tea";
-  int                  size = strlen(e_lit);
+  size_t               size = strlen(e_lit);
   int_type*            i_arr = new int_type[size + 1];
   int_type*            i_ref = new int_type[size + 1];
-  wmemset(i_arr, 0xdeadbeef, size + 1);
-  wmemset(i_ref, 0xdeadbeef, size + 1);
+  wmemset(i_arr, static_cast<wchar_t>(0xdeadbeef), size + 1);
+  wmemset(i_ref, static_cast<wchar_t>(0xdeadbeef), size + 1);
   int_type*            ito_next;
 
   locale               loc;

diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/5.cc
index ee57ce0..25b9566 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/5.cc
@@ -1,6 +1,6 @@
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -54,11 +54,11 @@ void test05()
   const ext_type       e_lit[] = { '\0', '\0', 'f', '\0' };
   const ext_type*       efrom_next;
   const int_type       i_lit[] = { L'\0', L'\0', L'f', L'\0' };
-  int                  size = sizeof(e_lit);
+  size_t               size = sizeof(e_lit);
   int_type*            i_arr = new int_type[size + 1];
   int_type*            i_ref = new int_type[size + 1];
-  wmemset(i_arr, 0xdeadbeef, size + 1);
-  wmemset(i_ref, 0xdeadbeef, size + 1);
+  wmemset(i_arr, static_cast<wchar_t>(0xdeadbeef), size + 1);
+  wmemset(i_ref, static_cast<wchar_t>(0xdeadbeef), size + 1);
   int_type*            ito_next;
 
   locale               loc;

diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/6.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/6.cc
index 49cdd72..79cd982 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/6.cc
@@ -1,6 +1,6 @@
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -54,11 +54,11 @@ void test06()
   const ext_type*      e_lit = "black pearl jasmine tea";
   const ext_type*       efrom_next;
   const int_type*      i_lit = L"black pearl jasmine tea";
-  int                  size = strlen(e_lit);
+  size_t               size = strlen(e_lit);
   int_type*            i_arr = new int_type[size + 1];
   int_type*            i_ref = new int_type[size + 1];
-  wmemset(i_arr, 0xdeadbeef, size + 1);
-  wmemset(i_ref, 0xdeadbeef, size + 1);
+  wmemset(i_arr, static_cast<wchar_t>(0xdeadbeef), size + 1);
+  wmemset(i_ref, static_cast<wchar_t>(0xdeadbeef), size + 1);
   int_type*            ito_next;
 
   locale               loc;

diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc
index 227a5a3..0da20be 100644 (file)
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc
@@ -1,6 +1,6 @@
 // 2003-05-01 Petur Runolfsson <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2006 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -50,7 +50,7 @@ void test01()
   VERIFY( getwc(fin) == L'X' );
 
   wchar_t buf[5];
-  wmemset(buf, 0xdeadbeef, 5);
+  wmemset(buf, static_cast<wchar_t>(0xdeadbeef), 5);
   VERIFY( wsbuf.sgetn(buf, 5) == 5 );
   VERIFY( !wmemcmp(buf, w_lit + 3, 5) );
   VERIFY( traits_type::to_char_type(getwc(fin)) == w_lit[8] );