diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-11-30 12:41:56 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-11-30 12:41:56 +0100 |
| commit | fd0d899b57a1c3283bf47e414cad99e0f1bd3a2c (patch) | |
| tree | 98f11f6ca28a2ea30f5c66786ecba925fd13bb5b /gcc/ada/sem_ch6.adb | |
| parent | 33f9ea08c652e009b218398cf9c98dab7e9af7af (diff) | |
| download | gcc-fd0d899b57a1c3283bf47e414cad99e0f1bd3a2c.zip gcc-fd0d899b57a1c3283bf47e414cad99e0f1bd3a2c.tar.gz gcc-fd0d899b57a1c3283bf47e414cad99e0f1bd3a2c.tar.bz2 | |
[multiple changes]
2009-11-30 Vincent Celier <celier@adacore.com>
* prj-tree.ads: Minor comment updates
* prj-tree.adb: Minor reformatting
2009-11-30 Ed Schonberg <schonberg@adacore.com>
* sem_ch3.adb (Derive_Subprogram): Indicate that an inherited
predefined control operation is hidden if the parent type is not
visibly controlled.
* sem_ch6.adb (Check_Overriding_Indicator): Do not report error if
overridden operation is not visible, as may be the case with predefined
control operations.
* sem_disp.adb (Check_Dispatching_Operation): Do not emit warning on
non-overriding control operation when type is not visibly controlled,
if the subprogram has an explicit overriding indicator.
* sem_util.ads, sem_util.adb (Is_Visibly_Controlled): Moved here from
sem_disp.adb.
From-SVN: r154791
Diffstat (limited to 'gcc/ada/sem_ch6.adb')
| -rw-r--r-- | gcc/ada/sem_ch6.adb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 94ed69e..c57bb56 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -4454,7 +4454,9 @@ package body Sem_Ch6 is end; end if; - if Present (Overridden_Subp) then + if Present (Overridden_Subp) + and then not Is_Hidden (Overridden_Subp) + then if Must_Not_Override (Spec) then Error_Msg_Sloc := Sloc (Overridden_Subp); |