CVS difference for ai05s/ai05-0111-3.txt

--- ai05s/ai05-0111-3.txt	2011/06/18 07:18:33	1.13
+++ ai05s/ai05-0111-3.txt	2011/06/20 04:55:17	1.14
@@ -158,8 +158,9 @@
        function Pool_of_Subpool(Subpool : not null Subpool_Handle)
            return access Root_Storage_Pool_With_Subpools'Class;
 
-       procedure Set_Pool_of_Subpool(Subpool : not null Subpool_Handle;
-                                     To : in out Root_Storage_Pool_With_Subpools'Class);
+       procedure Set_Pool_of_Subpool(
+         Subpool : not null Subpool_Handle;
+         To : in out Root_Storage_Pool_With_Subpools'Class);
 
        procedure Allocate_From_Subpool(
          Pool : in out Root_Storage_Pool_With_Subpools;
@@ -175,7 +176,8 @@
            with Pre'Class => Pool_of_Subpool(Subpool) = Pool'Access;
 
        function Default_Subpool_for_Pool(
-         Pool : in Root_Storage_Pool_With_Subpools) return not null Subpool_Handle;
+         Pool : in Root_Storage_Pool_With_Subpools)
+           return not null Subpool_Handle;
 
        overriding
        procedure Allocate(
@@ -342,14 +344,16 @@
 
 13.11.5 Subpool Reclamation
 
+A subpool may be explicitly deallocated using Unchecked_Deallocate_Subpool.
+
+Static Semantics
+
 The following language-defined library procedure exists:
 
    with System.Storage_Pools.Subpools;
    procedure Ada.Unchecked_Deallocate_Subpool
       (Subpool : in out System.Storage_Pools.Subpools.Subpool_Handle);
 
-A subpool may be explicitly deallocated using Unchecked_Deallocate_Subpool.
-
 If Subpool is null, a call on Unchecked_Deallocate_Subpool has no
 effect. Otherwise, the subpool is finalized, and Subpool is set to null.
 
@@ -1033,6 +1037,8 @@
 
 !corrigendum 13.11.5(0)
 
+A subpool may be explicitly deallocated using Unchecked_Deallocate_Subpool.
+
 @i<@s8<Static Semantics>>
 
 The following language-defined library procedure exists:
@@ -1041,8 +1047,6 @@
 @b<procedure> Ada.Unchecked_Deallocate_Subpool
    (Subpool : @b<in out> System.Storage_Pools.Subpools.Subpool_Handle);>
 
-A subpool may be explicitly deallocated using Unchecked_Deallocate_Subpool.
-
 If Subpool is @b<null>, a call on Unchecked_Deallocate_Subpool has no
 effect. Otherwise, the subpool is finalized, and Subpool is set to @b<null>.
 
@@ -1206,11 +1210,13 @@
 @xcode<      -- @ft<@i<Correct the alignment if necessary:>>
       Pool.Next_Allocation := Pool.Next_Allocation +
          ((-Pool.Next_Allocation) @b<mod> Alignment);
-      @b<if> Pool.Next_Allocation + Size_In_Storage_Elements @> Pool.Pool_Size @b<then>
+      @b<if> Pool.Next_Allocation + Size_In_Storage_Elements @>
+         Pool.Pool_Size @b<then>
          @b<raise> Storage_Error; -- @ft<@i<Out of space.>>
       @b<end if>;
       Storage_Address := Pool.Storage (Pool.Next_Allocation)'Address;
-      Pool.Next_Allocation := Pool.Next_Allocation + Size_In_Storage_Elements;
+      Pool.Next_Allocation :=
+         Pool.Next_Allocation + Size_In_Storage_Elements;
    @b<end> Allocate_From_Subpool;>
 
 @xcode<@b<end> MR_Pool;>