Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.

[pf3gnuchains/gcc-fork.git] / gcc / ada / s-wwdenu.adb

diff --git a/gcc/ada/s-wwdenu.adb b/gcc/ada/s-wwdenu.adb
index e0c3c12..5006ec5 100644 (file)
--- a/gcc/ada/s-wwdenu.adb
+++ b/gcc/ada/s-wwdenu.adb
@@ -6,25 +6,23 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2005 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
--- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
 -- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
 -- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
--- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
--- for  more details.  You should have  received  a copy of the GNU General --
--- Public License  distributed with GNAT;  see file COPYING.  If not, write --
--- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
--- MA 02111-1307, USA.                                                      --
+-- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
 --                                                                          --
--- As a special exception,  if other files  instantiate  generics from this --
--- unit, or you link  this unit with other files  to produce an executable, --
--- this  unit  does not  by itself cause  the resulting  executable  to  be --
--- covered  by the  GNU  General  Public  License.  This exception does not --
--- however invalidate  any other reasons why  the executable file  might be --
--- covered by the  GNU Public License.                                      --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/>.                                          --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --
@@ -34,7 +32,7 @@
 with System.WCh_StW; use System.WCh_StW;
 with System.WCh_Con; use System.WCh_Con;
 
-with Unchecked_Conversion;
+with Ada.Unchecked_Conversion;
 
 package body System.WWd_Enum is
 
@@ -55,7 +53,7 @@ package body System.WWd_Enum is
       type Index_Table_Ptr is access Index_Table;
 
       function To_Index_Table_Ptr is
-        new Unchecked_Conversion (System.Address, Index_Table_Ptr);
+        new Ada.Unchecked_Conversion (System.Address, Index_Table_Ptr);
 
       IndexesT : constant Index_Table_Ptr := To_Index_Table_Ptr (Indexes);
 
@@ -63,12 +61,14 @@ package body System.WWd_Enum is
       W := 0;
       for J in Lo .. Hi loop
          declare
-            WS : constant Wide_Wide_String :=
-                   String_To_Wide_Wide_String
-                     (Names (Natural (IndexesT (J)) ..
-                             Natural (IndexesT (J + 1)) - 1), EM);
+            S  : constant String :=
+                   Names (Natural (IndexesT (J)) ..
+                          Natural (IndexesT (J + 1)) - 1);
+            WS : Wide_Wide_String (1 .. S'Length);
+            L  : Natural;
          begin
-            W := Natural'Max (W, WS'Length);
+            String_To_Wide_Wide_String (S, WS, L, EM);
+            W := Natural'Max (W, L);
          end;
       end loop;
 
@@ -92,7 +92,7 @@ package body System.WWd_Enum is
       type Index_Table_Ptr is access Index_Table;
 
       function To_Index_Table_Ptr is
-        new Unchecked_Conversion (System.Address, Index_Table_Ptr);
+        new Ada.Unchecked_Conversion (System.Address, Index_Table_Ptr);
 
       IndexesT : constant Index_Table_Ptr := To_Index_Table_Ptr (Indexes);
 
@@ -100,12 +100,14 @@ package body System.WWd_Enum is
       W := 0;
       for J in Lo .. Hi loop
          declare
-            WS : constant Wide_Wide_String :=
-                   String_To_Wide_Wide_String
-                     (Names (Natural (IndexesT (J)) ..
-                             Natural (IndexesT (J + 1)) - 1), EM);
+            S  : constant String :=
+                   Names (Natural (IndexesT (J)) ..
+                          Natural (IndexesT (J + 1)) - 1);
+            WS : Wide_Wide_String (1 .. S'Length);
+            L  : Natural;
          begin
-            W := Natural'Max (W, WS'Length);
+            String_To_Wide_Wide_String (S, WS, L, EM);
+            W := Natural'Max (W, L);
          end;
       end loop;
 
@@ -129,7 +131,7 @@ package body System.WWd_Enum is
       type Index_Table_Ptr is access Index_Table;
 
       function To_Index_Table_Ptr is
-        new Unchecked_Conversion (System.Address, Index_Table_Ptr);
+        new Ada.Unchecked_Conversion (System.Address, Index_Table_Ptr);
 
       IndexesT : constant Index_Table_Ptr := To_Index_Table_Ptr (Indexes);
 
@@ -137,12 +139,14 @@ package body System.WWd_Enum is
       W := 0;
       for J in Lo .. Hi loop
          declare
-            WS : constant Wide_Wide_String :=
-                   String_To_Wide_Wide_String
-                     (Names (Natural (IndexesT (J)) ..
-                             Natural (IndexesT (J + 1)) - 1), EM);
+            S  : constant String :=
+                   Names (Natural (IndexesT (J)) ..
+                          Natural (IndexesT (J + 1)) - 1);
+            WS : Wide_Wide_String (1 .. S'Length);
+            L  : Natural;
          begin
-            W := Natural'Max (W, WS'Length);
+            String_To_Wide_Wide_String (S, WS, L, EM);
+            W := Natural'Max (W, L);
          end;
       end loop;
 
@@ -166,7 +170,7 @@ package body System.WWd_Enum is
       type Index_Table_Ptr is access Index_Table;
 
       function To_Index_Table_Ptr is
-        new Unchecked_Conversion (System.Address, Index_Table_Ptr);
+        new Ada.Unchecked_Conversion (System.Address, Index_Table_Ptr);
 
       IndexesT : constant Index_Table_Ptr := To_Index_Table_Ptr (Indexes);
 
@@ -174,12 +178,14 @@ package body System.WWd_Enum is
       W := 0;
       for J in Lo .. Hi loop
          declare
-            WS : constant Wide_String :=
-                   String_To_Wide_String
-                     (Names (Natural (IndexesT (J)) ..
-                             Natural (IndexesT (J + 1)) - 1), EM);
+            S  : constant String :=
+                   Names (Natural (IndexesT (J)) ..
+                          Natural (IndexesT (J + 1)) - 1);
+            WS : Wide_String (1 .. S'Length);
+            L  : Natural;
          begin
-            W := Natural'Max (W, WS'Length);
+            String_To_Wide_String (S, WS, L, EM);
+            W := Natural'Max (W, L);
          end;
       end loop;
 
@@ -203,7 +209,7 @@ package body System.WWd_Enum is
       type Index_Table_Ptr is access Index_Table;
 
       function To_Index_Table_Ptr is
-        new Unchecked_Conversion (System.Address, Index_Table_Ptr);
+        new Ada.Unchecked_Conversion (System.Address, Index_Table_Ptr);
 
       IndexesT : constant Index_Table_Ptr := To_Index_Table_Ptr (Indexes);
 
@@ -211,12 +217,14 @@ package body System.WWd_Enum is
       W := 0;
       for J in Lo .. Hi loop
          declare
-            WS : constant Wide_String :=
-                   String_To_Wide_String
-                     (Names (Natural (IndexesT (J)) ..
-                             Natural (IndexesT (J + 1)) - 1), EM);
+            S  : constant String :=
+                   Names (Natural (IndexesT (J)) ..
+                          Natural (IndexesT (J + 1)) - 1);
+            WS : Wide_String (1 .. S'Length);
+            L  : Natural;
          begin
-            W := Natural'Max (W, WS'Length);
+            String_To_Wide_String (S, WS, L, EM);
+            W := Natural'Max (W, L);
          end;
       end loop;
 
@@ -240,7 +248,7 @@ package body System.WWd_Enum is
       type Index_Table_Ptr is access Index_Table;
 
       function To_Index_Table_Ptr is
-        new Unchecked_Conversion (System.Address, Index_Table_Ptr);
+        new Ada.Unchecked_Conversion (System.Address, Index_Table_Ptr);
 
       IndexesT : constant Index_Table_Ptr := To_Index_Table_Ptr (Indexes);
 
@@ -248,12 +256,14 @@ package body System.WWd_Enum is
       W := 0;
       for J in Lo .. Hi loop
          declare
-            WS : constant Wide_String :=
-                   String_To_Wide_String
-                     (Names (Natural (IndexesT (J)) ..
-                             Natural (IndexesT (J + 1)) - 1), EM);
+            S  : constant String :=
+                   Names (Natural (IndexesT (J)) ..
+                          Natural (IndexesT (J + 1)) - 1);
+            WS : Wide_String (1 .. S'Length);
+            L  : Natural;
          begin
-            W := Natural'Max (W, WS'Length);
+            String_To_Wide_String (S, WS, L, EM);
+            W := Natural'Max (W, L);
          end;
       end loop;