diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-09-13 10:37:49 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-09-13 10:37:49 -0700 |
| commit | e252b51ccde010cbd2a146485d8045103cd99533 (patch) | |
| tree | e060f101cdc32bf5e520de8e5275db9d4236b74c /gcc/ada/libgnat/a-exexpr.adb | |
| parent | f10c7c4596dda99d2ee872c995ae4aeda65adbdf (diff) | |
| parent | 104c05c5284b7822d770ee51a7d91946c7e56d50 (diff) | |
| download | gcc-e252b51ccde010cbd2a146485d8045103cd99533.zip gcc-e252b51ccde010cbd2a146485d8045103cd99533.tar.gz gcc-e252b51ccde010cbd2a146485d8045103cd99533.tar.bz2 | |
Merge from trunk revision 104c05c5284b7822d770ee51a7d91946c7e56d50.
Diffstat (limited to 'gcc/ada/libgnat/a-exexpr.adb')
| -rw-r--r-- | gcc/ada/libgnat/a-exexpr.adb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/ada/libgnat/a-exexpr.adb b/gcc/ada/libgnat/a-exexpr.adb index fb4b545..ff85bc5 100644 --- a/gcc/ada/libgnat/a-exexpr.adb +++ b/gcc/ada/libgnat/a-exexpr.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2020, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2021, 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- -- @@ -91,6 +91,9 @@ package body Exception_Propagation is use Exception_Traces; + type bool is new Boolean; + pragma Convention (C, bool); + Foreign_Exception : aliased System.Standard_Library.Exception_Data; pragma Import (Ada, Foreign_Exception, "system__exceptions__foreign_exception"); @@ -277,9 +280,8 @@ package body Exception_Propagation is -- painful and error prone. These subprograms could be moved to a more -- widely visible location if need be. - function Is_Handled_By_Others (E : Exception_Data_Ptr) return Boolean; + function Is_Handled_By_Others (E : Exception_Data_Ptr) return bool; pragma Export (C, Is_Handled_By_Others, "__gnat_is_handled_by_others"); - pragma Warnings (Off, Is_Handled_By_Others); function Language_For (E : Exception_Data_Ptr) return Character; pragma Export (C, Language_For, "__gnat_language_for"); @@ -685,9 +687,7 @@ package body Exception_Propagation is -- Foreign_Data_For -- ---------------------- - function Foreign_Data_For - (E : SSL.Exception_Data_Ptr) return Address - is + function Foreign_Data_For (E : Exception_Data_Ptr) return Address is begin return E.Foreign_Data; end Foreign_Data_For; @@ -696,16 +696,16 @@ package body Exception_Propagation is -- Is_Handled_By_Others -- -------------------------- - function Is_Handled_By_Others (E : SSL.Exception_Data_Ptr) return Boolean is + function Is_Handled_By_Others (E : Exception_Data_Ptr) return bool is begin - return not E.all.Not_Handled_By_Others; + return not bool (E.all.Not_Handled_By_Others); end Is_Handled_By_Others; ------------------ -- Language_For -- ------------------ - function Language_For (E : SSL.Exception_Data_Ptr) return Character is + function Language_For (E : Exception_Data_Ptr) return Character is begin return E.all.Lang; end Language_For; |