diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-03-26 20:02:45 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-03-26 20:02:45 +0000 |
| commit | 261a23bc4f7fbd525cb2f73582743252d2d2f8ac (patch) | |
| tree | f3c8a991bcf4caac8dd5516247a2d92c9f77ee3b /gcc/ada/s-tposen.adb | |
| parent | 0c164b6eab526a1d0db4a3d08058262ddd476be6 (diff) | |
| download | gcc-261a23bc4f7fbd525cb2f73582743252d2d2f8ac.tar.gz | |
2008-03-26 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r133612 (in particular gcc/Makefile.in with auto dependencies)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@133613 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/s-tposen.adb')
| -rw-r--r-- | gcc/ada/s-tposen.adb | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/gcc/ada/s-tposen.adb b/gcc/ada/s-tposen.adb index aeee03684b4..cfa7d3a7e7e 100644 --- a/gcc/ada/s-tposen.adb +++ b/gcc/ada/s-tposen.adb @@ -2,12 +2,11 @@ -- -- -- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS -- -- -- --- S Y S T E M . T A S K I N G . P R O T E C T E D _ O B J E C T S . -- --- S I N G L E _ E N T R Y -- +-- SYSTEM.TASKING.PROTECTED_OBJECTS.SINGLE_ENTRY -- -- -- -- B o d y -- -- -- --- Copyright (C) 1998-2007, Free Software Foundation, Inc. -- +-- Copyright (C) 1998-2008, 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- -- @@ -33,8 +32,8 @@ ------------------------------------------------------------------------------ pragma Style_Checks (All_Checks); --- Turn off subprogram ordering check, since restricted GNARLI --- subprograms are gathered together at end. +-- Turn off subprogram ordering check, since restricted GNARLI subprograms are +-- gathered together at end. -- This package provides an optimized version of Protected_Objects.Operations -- and Protected_Objects.Entries making the following assumptions: @@ -60,19 +59,12 @@ pragma Polling (Off); -- operations. It can cause infinite loops and other problems. pragma Suppress (All_Checks); - -with System.Task_Primitives.Operations; --- used for Self --- Finalize_Lock --- Write_Lock --- Unlock +-- Why is this required ??? with Ada.Exceptions; --- used for Exception_Id --- Raise_Exception +with System.Task_Primitives.Operations; with System.Parameters; --- used for Single_Lock package body System.Tasking.Protected_Objects.Single_Entry is @@ -155,7 +147,7 @@ package body System.Tasking.Protected_Objects.Single_Entry is use type Ada.Exceptions.Exception_Id; E : constant Ada.Exceptions.Exception_Id := - Entry_Call.Exception_To_Raise; + Entry_Call.Exception_To_Raise; begin if E /= Ada.Exceptions.Null_Id then @@ -560,8 +552,7 @@ package body System.Tasking.Protected_Objects.Single_Entry is if Detect_Blocking and then Self_Id.Common.Protected_Action_Nesting > 0 then - Ada.Exceptions.Raise_Exception - (Program_Error'Identity, "potentially blocking operation"); + raise Program_Error with "potentially blocking operation"; end if; Lock_Entry (Object); @@ -686,8 +677,7 @@ package body System.Tasking.Protected_Objects.Single_Entry is if Detect_Blocking and then Self_Id.Common.Protected_Action_Nesting > 0 then - Ada.Exceptions.Raise_Exception - (Program_Error'Identity, "potentially blocking operation"); + raise Program_Error with "potentially blocking operation"; end if; STPO.Write_Lock (Object.L'Access, Ceiling_Violation); |