diff options
Diffstat (limited to 'gcc/ada/g-table.adb')
| -rw-r--r-- | gcc/ada/g-table.adb | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/gcc/ada/g-table.adb b/gcc/ada/g-table.adb index fe4ebd1c842..a1e5ef9aa73 100644 --- a/gcc/ada/g-table.adb +++ b/gcc/ada/g-table.adb @@ -6,8 +6,7 @@ -- -- -- B o d y -- -- -- --- -- --- Copyright (C) 1998-2001 Ada Core Technologies, Inc. -- +-- Copyright (C) 1998-2002 Ada Core Technologies, 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- -- @@ -33,7 +32,8 @@ with System; use System; with System.Memory; use System.Memory; -with System.Address_To_Access_Conversions; + +with Unchecked_Conversion; package body GNAT.Table is @@ -59,17 +59,8 @@ package body GNAT.Table is -- in Max. Works correctly to do an initial allocation if the table -- is currently null. - package Table_Conversions is - new System.Address_To_Access_Conversions (Big_Table_Type); - -- Address and Access conversions for a Table object. - - function To_Address (Table : Table_Ptr) return Address; - pragma Inline (To_Address); - -- Returns the Address for the Table object. - - function To_Pointer (Table : Address) return Table_Ptr; - pragma Inline (To_Pointer); - -- Returns the Access pointer for the Table object. + function To_Address is new Unchecked_Conversion (Table_Ptr, Address); + function To_Pointer is new Unchecked_Conversion (Address, Table_Ptr); -------------- -- Allocate -- @@ -136,7 +127,7 @@ package body GNAT.Table is ---------- procedure Init is - Old_Length : Integer := Length; + Old_Length : constant Integer := Length; begin Last_Val := Min - 1; @@ -256,25 +247,6 @@ package body GNAT.Table is end if; end Set_Last; - ---------------- - -- To_Address -- - ---------------- - - function To_Address (Table : Table_Ptr) return Address is - begin - return Table_Conversions.To_Address - (Table_Conversions.Object_Pointer (Table)); - end To_Address; - - ---------------- - -- To_Pointer -- - ---------------- - - function To_Pointer (Table : Address) return Table_Ptr is - begin - return Table_Ptr (Table_Conversions.To_Pointer (Table)); - end To_Pointer; - begin Init; end GNAT.Table; |