diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-09 15:53:19 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-09 15:53:19 +0200 |
| commit | 5fdc49eca660d130ec4815eb7a804aa7fd89773d (patch) | |
| tree | e086c42c03e0ad00c16188e846a79c6649bb7102 /gcc/ada/s-tpobop.adb | |
| parent | b100151b6d20180b9e11b259943fd8e63fdec865 (diff) | |
| download | gcc-5fdc49eca660d130ec4815eb7a804aa7fd89773d.zip gcc-5fdc49eca660d130ec4815eb7a804aa7fd89773d.tar.gz gcc-5fdc49eca660d130ec4815eb7a804aa7fd89773d.tar.bz2 | |
[multiple changes]
2010-09-09 Robert Dewar <dewar@adacore.com>
* sinput-p.ads: Minor comment update.
2010-09-09 Arnaud Charlet <charlet@adacore.com>
* s-tpobop.adb, s-taenca.adb (Wait_For_Completion_With_Timeout): Reset
Entry_Call.State if needed so that the call is marked as cancelled by
Check_Pending_Actions_For_Entry_Call.
(Timed_Protected_Entry_Call): Adjust calls to Defer/Under_Abort, since
this procedure may be called from a controlled operation
(Initialize/Finalize).
2010-09-09 Vadim Godunko <godunko@adacore.com>
* impunit.adb: Correct spelling of package's name in the comment.
From-SVN: r164101
Diffstat (limited to 'gcc/ada/s-tpobop.adb')
| -rw-r--r-- | gcc/ada/s-tpobop.adb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/ada/s-tpobop.adb b/gcc/ada/s-tpobop.adb index f9ca610..0890181 100644 --- a/gcc/ada/s-tpobop.adb +++ b/gcc/ada/s-tpobop.adb @@ -958,7 +958,7 @@ package body System.Tasking.Protected_Objects.Operations is Send_Trace_Info (POT_Call, Entry_Index (E), Timeout); end if; - Initialization.Defer_Abort (Self_Id); + Initialization.Defer_Abort_Nestable (Self_Id); Lock_Entries (Object, Ceiling_Violation); if Ceiling_Violation then @@ -1009,7 +1009,7 @@ package body System.Tasking.Protected_Objects.Operations is end if; Entry_Call_Successful := Entry_Call.State = Done; - Initialization.Undefer_Abort (Self_Id); + Initialization.Undefer_Abort_Nestable (Self_Id); Entry_Calls.Check_Exception (Self_Id, Entry_Call); return; end if; @@ -1025,7 +1025,7 @@ package body System.Tasking.Protected_Objects.Operations is -- ??? Do we need to yield in case Yielded is False - Initialization.Undefer_Abort (Self_Id); + Initialization.Undefer_Abort_Nestable (Self_Id); Entry_Call_Successful := Entry_Call.State = Done; Entry_Calls.Check_Exception (Self_Id, Entry_Call); end Timed_Protected_Entry_Call; |