diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-04-12 15:41:03 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-04-12 15:41:03 +0200 |
| commit | b69cd36a46e574d92de18e1ede3d31e951ccf30e (patch) | |
| tree | 983081c2f329d06316f9687cf9737e4c99522cc8 /gcc/ada/par-util.adb | |
| parent | 7893514cf6a62a34a48f61ddd4b03bdd47b1b4be (diff) | |
| download | gcc-b69cd36a46e574d92de18e1ede3d31e951ccf30e.zip gcc-b69cd36a46e574d92de18e1ede3d31e951ccf30e.tar.gz gcc-b69cd36a46e574d92de18e1ede3d31e951ccf30e.tar.bz2 | |
[multiple changes]
2013-04-12 Robert Dewar <dewar@adacore.com>
* namet.adb, namet.ads: Minor addition (7 arg version of Nam_In).
* exp_prag.adb, sem_ch3.adb, sem_intr.adb, sem_type.adb, exp_util.adb,
sem_aux.adb, exp_ch9.adb, sem_ch7.adb, sem_ch10.adb, sem_prag.adb,
par-ch2.adb, tbuild.adb, rtsfind.adb, freeze.adb, sem_util.adb,
sem_res.adb, sem_attr.adb, exp_ch2.adb, prj-makr.adb, sem_elab.adb,
exp_ch4.adb, sem_ch4.adb, sem_mech.adb, sem_ch6.adb, par-prag.adb,
prj-nmsc.adb, exp_disp.adb, sem_ch8.adb, sem_warn.adb, par-util.adb,
sem_eval.adb, exp_intr.adb, sem_ch13.adb, exp_cg.adb, lib-xref.adb,
sem_disp.adb, exp_ch3.adb: Minor code reorganization (use Nam_In).
2013-04-12 Doug Rupp <rupp@adacore.com>
* init.c: Don't clobber condition code on VMS.
From-SVN: r197917
Diffstat (limited to 'gcc/ada/par-util.adb')
| -rw-r--r-- | gcc/ada/par-util.adb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/ada/par-util.adb b/gcc/ada/par-util.adb index 3b59287..f2ac335 100644 --- a/gcc/ada/par-util.adb +++ b/gcc/ada/par-util.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2012, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2013, 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- -- @@ -181,8 +181,7 @@ package body Util is if Ada_Version = Ada_95 and then Warn_On_Ada_2005_Compatibility then - if Token_Name = Name_Overriding - or else Token_Name = Name_Synchronized + if Nam_In (Token_Name, Name_Overriding, Name_Synchronized) or else (Token_Name = Name_Interface and then Prev_Token /= Tok_Pragma) then |