aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/erroutc.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2014-05-21 14:35:51 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2014-05-21 14:35:51 +0200
commit77a40ec16aeae9e13a96cef15799dd992cd23106 (patch)
treed5cc7f6d4438f211fb69543f995409bf0ba9712c /gcc/ada/erroutc.adb
parentdbed5a9bffce4f2c875abc4f9f502ed339aa0ae0 (diff)
downloadgcc-77a40ec16aeae9e13a96cef15799dd992cd23106.zip
gcc-77a40ec16aeae9e13a96cef15799dd992cd23106.tar.gz
gcc-77a40ec16aeae9e13a96cef15799dd992cd23106.tar.bz2
[multiple changes]
2014-05-21 Robert Dewar <dewar@adacore.com> * errout.adb, erroutc.adb, erroutc.ads: Allow warning tag in pragma Warnings (Off, string). 2014-05-21 Robert Dewar <dewar@adacore.com> * osint.adb: Fix three error messages to say invalid instead of erroneous. * par-ch4.adb, exp_aggr.adb, sem_attr.adb, sem_aux.adb, sem_ch3.adb, sem_ch5.adb, sem_ch6.adb, sem_ch7.adb, sem_dim.adb, sem_res.adb, sem_util.adb, sem_util.ads: Fix incorrect use of erroneous in comments. 2014-05-21 Ed Schonberg <schonberg@adacore.com> * freeze.adb, sem_ch13.adb, sem_ch13.ads, sem_ch9.adb, sem_ch9.ads: Move discriminant manipulation routines for analysis of aspect specifications from sem_ch9 to sem_ch13, where they belong. From-SVN: r210695
Diffstat (limited to 'gcc/ada/erroutc.adb')
-rw-r--r--gcc/ada/erroutc.adb7
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/ada/erroutc.adb b/gcc/ada/erroutc.adb
index 5a7a11a..e0fad22 100644
--- a/gcc/ada/erroutc.adb
+++ b/gcc/ada/erroutc.adb
@@ -1457,7 +1457,8 @@ package body Erroutc is
function Warning_Specifically_Suppressed
(Loc : Source_Ptr;
- Msg : String_Ptr) return String_Id
+ Msg : String_Ptr;
+ Tag : String) return String_Id
is
begin
-- Loop through specific warning suppression entries
@@ -1473,7 +1474,9 @@ package body Erroutc is
if SWE.Config
or else (SWE.Start <= Loc and then Loc <= SWE.Stop)
then
- if Matches (Msg.all, SWE.Msg.all) then
+ if Matches (Msg.all, SWE.Msg.all)
+ or else Matches (Tag, SWE.Msg.all)
+ then
SWE.Used := True;
return SWE.Reason;
end if;