X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fsrc%2Fterminal_interface-curses-forms-field_types-user-choice.adb;h=3a7e6b5aeb2ed4da82fdca622f7578d9259cb5d0;hp=2a3ae47744ad8876c7df1e660251f4103736072f;hb=2b635f090ec43c82958cef9369464aee4dd8975f;hpb=687aeec3e382083652c3bb2e94fb6d3bf101a1f9

diff --git a/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb b/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb
index 2a3ae477..3a7e6b5a 100644
--- a/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb
+++ b/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb
@@ -35,19 +35,17 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.16 $
---  $Date: 2011/03/08 01:16:49 $
+--  $Revision: 1.17 $
+--  $Date: 2011/03/22 10:53:37 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Ada.Unchecked_Conversion;
+with System.Address_To_Access_Conversions;
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 
 package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice is
 
-   pragma Warnings (Off);
-   function To_Argument_Access is new Ada.Unchecked_Conversion
-     (System.Address, Argument_Access);
-   pragma Warnings (On);
+   package Argument_Conversions is
+      new System.Address_To_Access_Conversions (Argument);
 
    function Generic_Next (Fld : Field;
                           Usr : System.Address) return Curses_Bool
@@ -55,7 +53,7 @@ package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice is
       Result : Boolean;
       Udf    : constant User_Defined_Field_Type_With_Choice_Access :=
         User_Defined_Field_Type_With_Choice_Access
-        (To_Argument_Access (Usr).Typ);
+        (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ);
    begin
       Result := Next (Fld, Udf.all);
       return Curses_Bool (Boolean'Pos (Result));
@@ -67,7 +65,7 @@ package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice is
       Result : Boolean;
       Udf    : constant User_Defined_Field_Type_With_Choice_Access :=
         User_Defined_Field_Type_With_Choice_Access
-        (To_Argument_Access (Usr).Typ);
+        (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ);
    begin
       Result := Previous (Fld, Udf.all);
       return Curses_Bool (Boolean'Pos (Result));