summaryrefslogtreecommitdiff
path: root/gcc/ada/exp_ch7.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-15 16:00:42 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-15 16:00:42 +0000
commit51085d5c35a0ade4ede752a15e07d720c4d4ebc5 (patch)
tree8bd881343caef123db2035c2fb13caccf47ea8a1 /gcc/ada/exp_ch7.adb
parentba40b4affc67004522f70a179d3667fbedf60167 (diff)
downloadgcc-51085d5c35a0ade4ede752a15e07d720c4d4ebc5.tar.gz
2005-03-08 Ed Schonberg <schonberg@adacore.com>
* exp_ch7.adb (Convert_View): Use base types of underlying types when determining whether an unchecked conversion is needed for the argument of an initialization call. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96494 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/exp_ch7.adb')
-rw-r--r--gcc/ada/exp_ch7.adb8
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index 6134df71199..4e300b9508f 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2004, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005, 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- --
@@ -984,7 +984,9 @@ package body Exp_Ch7 is
and then Present (Atyp)
and then
(Is_Private_Type (Ftyp) or else Is_Private_Type (Atyp))
- and then Underlying_Type (Atyp) = Underlying_Type (Ftyp)
+ and then
+ Base_Type (Underlying_Type (Atyp)) =
+ Base_Type (Underlying_Type (Ftyp))
then
return Unchecked_Convert_To (Ftyp, Arg);
@@ -2139,7 +2141,7 @@ package body Exp_Ch7 is
-- Add statements to the cleanup handler of the (ordinary)
-- subprogram expanded to implement a protected subprogram,
- -- unlocking the protected object parameter and undeferring abortion.
+ -- unlocking the protected object parameter and undeferring abort.
-- If this is a protected procedure, and the object contains
-- entries, this also calls the entry service routine.