diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-07-13 10:39:28 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-07-13 10:39:28 +0200 |
| commit | 019578498e189c256e1238fe7d981fb02740a71a (patch) | |
| tree | 164176c7f48023bea63ede90147c01010044b3fa /gcc/ada/s-tpobop.adb | |
| parent | 79afa047b2dd7cd699600ade0275d5392cfc3e03 (diff) | |
| download | gcc-019578498e189c256e1238fe7d981fb02740a71a.zip gcc-019578498e189c256e1238fe7d981fb02740a71a.tar.gz gcc-019578498e189c256e1238fe7d981fb02740a71a.tar.bz2 | |
[multiple changes]
2009-07-13 Robert Dewar <dewar@adacore.com>
* gnat_ugn.texi: The gnatf switch no longer is needed to get full
details on unsupported constructs.
* rtsfind.adb: Remove references to All_Errors_Mode, give errors
unconditionally.
* s-trafor-default.adb: Correct some warnings
* s-valwch.adb, a-calend.adb, freeze.adb, prj.ads, s-vmexta.adb,
sem.adb, sem_ch10.adb, sem_ch6.adb, sem_disp.adb, vxaddr2line.adb:
Minor reformatting.
* par-ch4.adb (Conditional_Expression): Capture proper location for
conditional expression, should point to IF.
* s-tassta.adb, a-wtdeau.adb, s-tasren.adb, s-arit64.adb, s-imgdec.adb,
s-direio.adb, s-tpobop.adb, g-socket.adb, s-tposen.adb, s-taskin.adb,
g-calend.adb, s-regpat.adb, s-scaval.adb, g-catiio.adb: Minor code
reorganization (use conditional expressions).
2009-07-13 Ed Schonberg <schonberg@adacore.com>
* exp_util.adb (Remove_Side_Effects): If the expression is a call to a
build-in-place function that returns an inherently limited type (not
just a task type) create proper object declaration so that extra
build-in-place actuals are properly added to the call.
From-SVN: r149551
Diffstat (limited to 'gcc/ada/s-tpobop.adb')
| -rw-r--r-- | gcc/ada/s-tpobop.adb | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gcc/ada/s-tpobop.adb b/gcc/ada/s-tpobop.adb index 06102da..13688e6 100644 --- a/gcc/ada/s-tpobop.adb +++ b/gcc/ada/s-tpobop.adb @@ -582,11 +582,9 @@ package body System.Tasking.Protected_Objects.Operations is Entry_Call.Mode := Mode; Entry_Call.Cancellation_Attempted := False; - if Self_ID.Deferral_Level > 1 then - Entry_Call.State := Never_Abortable; - else - Entry_Call.State := Now_Abortable; - end if; + Entry_Call.State := + (if Self_ID.Deferral_Level > 1 + then Never_Abortable else Now_Abortable); Entry_Call.E := Entry_Index (E); Entry_Call.Prio := STPO.Get_Priority (Self_ID); @@ -972,17 +970,15 @@ package body System.Tasking.Protected_Objects.Operations is pragma Debug (Debug.Trace (Self_Id, "TPEC: exited to ATC level: " & ATC_Level'Image (Self_Id.ATC_Nesting_Level), 'A')); - Entry_Call := - Self_Id.Entry_Calls (Self_Id.ATC_Nesting_Level)'Access; + Entry_Call := Self_Id.Entry_Calls (Self_Id.ATC_Nesting_Level)'Access; Entry_Call.Next := null; Entry_Call.Mode := Timed_Call; Entry_Call.Cancellation_Attempted := False; - if Self_Id.Deferral_Level > 1 then - Entry_Call.State := Never_Abortable; - else - Entry_Call.State := Now_Abortable; - end if; + Entry_Call.State := + (if Self_Id.Deferral_Level > 1 + then Never_Abortable + else Now_Abortable); Entry_Call.E := Entry_Index (E); Entry_Call.Prio := STPO.Get_Priority (Self_Id); |