2013-07-08 Hristian Kirtchev <kirtchev@adacore.com>

	* exp_ch4.adb (Create_Alternative): Removed.
	(Expand_N_If_Expression): Remove constant
	In_Case_Or_If_Expression. Add local variable
	Ptr_Typ. Inspect the "then" and "else" action lists
	for transient controlled objects and generate code to
	finalize them.	(Is_Controlled_Function_Call): Removed.
	(Process_Action): Update the comment on usage. Update the call
	to Process_Transient_Object. There is no need to continue the
	traversal of the object itself.
	(Process_Actions): New routine.
	(Process_Transient_Object): Moved to the top level of Exp_Ch4. Add
	a new formal and update the related comment on usage.
	* exp_util.adb (Within_Case_Or_If_Expression): Start the search
	from the parent of the node.

2013-07-08  Robert Dewar  <dewar@adacore.com>

	* a-cusyqu.ads, a-cbprqu.ads, s-interr.ads, a-cuprqu.ads,
	a-cbsyqu.ads: Minor reformatting (proper formatting of overriding).



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200759 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 15 deletions

diff --git a/gcc/ada/a-cuprqu.ads b/gcc/ada/a-cuprqu.ads
index 3709f42aa29..4e11d6eef05 100644
--- a/gcc/ada/a-cuprqu.ads
+++ b/gcc/ada/a-cuprqu.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---            Copyright (C) 2011, Free Software Foundation, Inc.            --
+--          Copyright (C) 2011-2013, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -94,19 +94,18 @@ package Ada.Containers.Unbounded_Priority_Queues is
          Max_Length  : Count_Type := 0;
       end record;
 
-      overriding
-      procedure Finalize (List : in out List_Type);
+      overriding procedure Finalize (List : in out List_Type);
 
    end Implementation;
 
    protected type Queue (Ceiling : System.Any_Priority := Default_Ceiling)
-     with Priority => Ceiling is new Queue_Interfaces.Queue with
+   with
+     Priority => Ceiling
+   is new Queue_Interfaces.Queue with
 
-      overriding
-      entry Enqueue (New_Item : Queue_Interfaces.Element_Type);
+      overriding entry Enqueue (New_Item : Queue_Interfaces.Element_Type);
 
-      overriding
-      entry Dequeue (Element : out Queue_Interfaces.Element_Type);
+      overriding entry Dequeue (Element : out Queue_Interfaces.Element_Type);
 
       --  The priority queue operation Dequeue_Only_High_Priority had been a
       --  protected entry in early drafts of AI05-0159, but it was discovered
@@ -115,22 +114,17 @@ package Ada.Containers.Unbounded_Priority_Queues is
       --  ARG meeting in Edinburgh (June 2011), with a different signature and
       --  semantics.
 
-      not overriding
       procedure Dequeue_Only_High_Priority
         (At_Least : Queue_Priority;
          Element  : in out Queue_Interfaces.Element_Type;
          Success  : out Boolean);
 
-      overriding
-      function Current_Use return Count_Type;
+      overriding function Current_Use return Count_Type;
 
-      overriding
-      function Peak_Use return Count_Type;
+      overriding function Peak_Use return Count_Type;
 
    private
-
       List : Implementation.List_Type;
-
    end Queue;
 
 end Ada.Containers.Unbounded_Priority_Queues;