CVS difference for acats/b3/b392009.a
--- acats/b3/b392009.a 1999/03/11 00:20:08 1.2
+++ acats/b3/b392009.a 2007/09/29 04:43:42 1.3
@@ -3,22 +3,22 @@
-- Grant of Unlimited Rights
--
-- Under contracts F33600-87-D-0337, F33600-84-D-0280, MDA903-79-C-0687,
--- d DCA100-97-D-0025, the U.S. Government obtained
+-- F08630-91-C-0015, and DCA100-97-D-0025, the U.S. Government obtained
-- unlimited rights in the software and documentation contained herein.
--- defined in DFAR 252.227-7013(a)(19). By making
--- the Government intends to confer upon all
--- rights equal to those held by the Government.
--- rights to use, duplicate, release or disclose the
--- ata and computer software in whole or in part, in
--- ny purpose whatsoever, and to have or permit others
+-- Unlimited rights are defined in DFAR 252.227-7013(a)(19). By making
+-- this public release, the Government intends to confer upon all
+-- recipients unlimited rights equal to those held by the Government.
+-- These rights include rights to use, duplicate, release or disclose the
+-- released technical data and computer software in whole or in part, in
+-- any manner and for any purpose whatsoever, and to have or permit others
-- to do so.
--
-- DISCLAIMER
--
-- ALL MATERIALS OR INFORMATION HEREIN RELEASED, MADE AVAILABLE OR
--- THE GOVERNMENT MAKES NO EXPRESS OR IMPLIED
+-- DISCLOSED ARE AS IS. THE GOVERNMENT MAKES NO EXPRESS OR IMPLIED
-- WARRANTY AS TO ANY MATTER WHATSOEVER, INCLUDING THE CONDITIONS OF THE
--- ION OR OTHER INFORMATION RELEASED, MADE AVAILABLE
+-- SOFTWARE, DOCUMENTATION OR OTHER INFORMATION RELEASED, MADE AVAILABLE
-- OR DISCLOSED, OR THE OWNERSHIP, MERCHANTABILITY, OR FITNESS FOR A
-- PARTICULAR PURPOSE OF SAID MATERIAL.
--*
@@ -49,7 +49,7 @@
-- made through the access-to-subprogram value do not dispatch; i.e.,
-- the actual parameter to the call must be of the tagged type in the
-- designated profile, and may not be any other descendant of that tagged
---
+-- type.
--
-- A subprogram (procedure or function) of the tagged type is called
-- through an access-to-subprogram value with various actuals which are
@@ -66,6 +66,9 @@
--
-- CHANGE HISTORY:
-- 06 Dec 94 SAIC ACVC 2.0
+-- 07 Sep 07 RLB Corrected for Amendment changes: made null
+-- exclusions explicit so that the
+-- access-to-subprogram type match the subprograms.
--
--!
@@ -81,7 +84,7 @@
procedure Proc (A: in Root); -- Dispatching operation.
function Func (A: Root) return Root; -- Dispatching operation.
- function Access_Parm_Func (A: access Root)
+ function Access_Parm_Func (A: not null access Root)
return Root; -- Dispatching operation.
procedure Access_Parm_Proc
@@ -102,8 +105,9 @@
function Func (A: Child) return Child; -- Dispatching operation.
-- (overrides parent's Func).
- function Access_Parm_Func (A: access Child) -- Dispatching operation.
- return Child; -- (overrides parent's).
+ function Access_Parm_Func (A: not null access Child)
+ return Child; -- Dispatching operation.
+ -- (overrides parent's).
end B392009_0;
@@ -131,7 +135,7 @@
end Func;
- function Access_Parm_Func (A: access Root) return Root is
+ function Access_Parm_Func (A: not null access Root) return Root is
begin
return A.all;
end Access_Parm_Func;
@@ -162,7 +166,7 @@
end Func;
- function Access_Parm_Func (A: access Child) return Child is
+ function Access_Parm_Func (A: not null access Child) return Child is
begin
return A.all;
end Access_Parm_Func;
@@ -202,7 +206,7 @@
-- while values of Acc_Parm_Func (may) designate primitive operations.
type Acc_Parm_Proc is access procedure (P: access B392009_0.Root'Class);
- type Acc_Parm_Func is access function (P: access B392009_0.Root)
+ type Acc_Parm_Func is access function (P: not null access B392009_0.Root)
return B392009_0.Root;
Acc_Proc_Ptr : Acc_Parm_Proc := B392009_0.Access_Parm_Proc'Access;
Questions? Ask the ACAA Technical Agent