diff options
author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-09-05 16:30:30 +0200 |
---|---|---|
committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-09-05 16:30:30 +0200 |
commit | e42bcfa38cc3f3315d10f448675807eee860ae3c (patch) | |
tree | 646f5b0a10883cd181e5420ad3f2d7169d6b0ac8 /gcc/ada/s-tpoben.adb | |
parent | 544e7c17b592df04a71809db899725dc502103c9 (diff) | |
download | gcc-e42bcfa38cc3f3315d10f448675807eee860ae3c.zip gcc-e42bcfa38cc3f3315d10f448675807eee860ae3c.tar.gz gcc-e42bcfa38cc3f3315d10f448675807eee860ae3c.tar.bz2 |
[multiple changes]
2011-09-05 Hristian Kirtchev <kirtchev@adacore.com>
* s-finmas.adb (Set_Finalize_Address): Explain the reason
for the synchronization. Move the test for null from
s-stposu.Allocate_Any_Controlled to this routine since the check
needs to be protected too.
(Set_Heterogeneous_Finalize_Address): Explain the reason for the
synchronization code.
* s-finmas.ads (Set_Heterogeneous_Finalize_Address): Add comment
explaining the context in which this routine is used.
* s-stposu.adb (Allocate_Any_Controlled): Move the test for null
to s-finmas.Set_Finalize_Address.
2011-09-05 Ed Schonberg <schonberg@adacore.com>
* einfo.ads: Document that itypes have no parent field.
2011-09-05 Robert Dewar <dewar@adacore.com>
* rtsfind.adb (Check_CRT): Check for overloaded entity
* rtsfind.ads: Document that entities to be found by rtsfind
cannot be overloaded
* s-taenca.adb, s-tasren.adb, s-tpobop.adb, s-tpoben.ads, s-tpoben.adb
(Lock_Entries_With_Status): New name for Lock_Entries with two
arguments (changed to meet rtsfind no overloading rule).
From-SVN: r178551
Diffstat (limited to 'gcc/ada/s-tpoben.adb')
-rw-r--r-- | gcc/ada/s-tpoben.adb | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/gcc/ada/s-tpoben.adb b/gcc/ada/s-tpoben.adb index ba2bf6c..8852731 100644 --- a/gcc/ada/s-tpoben.adb +++ b/gcc/ada/s-tpoben.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1998-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 1998-2011, Free Software Foundation, Inc. -- -- -- -- GNARL 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- -- @@ -261,7 +261,22 @@ package body System.Tasking.Protected_Objects.Entries is -- Lock_Entries -- ------------------ - procedure Lock_Entries + procedure Lock_Entries (Object : Protection_Entries_Access) is + Ceiling_Violation : Boolean; + + begin + Lock_Entries_With_Status (Object, Ceiling_Violation); + + if Ceiling_Violation then + raise Program_Error with "Ceiling Violation"; + end if; + end Lock_Entries; + + ------------------------------ + -- Lock_Entries_With_Status -- + ------------------------------ + + procedure Lock_Entries_With_Status (Object : Protection_Entries_Access; Ceiling_Violation : out Boolean) is @@ -316,19 +331,7 @@ package body System.Tasking.Protected_Objects.Entries is Self_Id.Common.Protected_Action_Nesting + 1; end; end if; - - end Lock_Entries; - - procedure Lock_Entries (Object : Protection_Entries_Access) is - Ceiling_Violation : Boolean; - - begin - Lock_Entries (Object, Ceiling_Violation); - - if Ceiling_Violation then - raise Program_Error with "Ceiling Violation"; - end if; - end Lock_Entries; + end Lock_Entries_With_Status; ---------------------------- -- Lock_Read_Only_Entries -- |