CVS difference for ai05s/ai05-0041-1.txt

--- ai05s/ai05-0041-1.txt	2008/11/27 00:04:12	1.10
+++ ai05s/ai05-0041-1.txt	2008/11/27 01:29:11	1.11
@@ -302,7 +302,8 @@
 It is weird to have some, but not all, of the rules apply to an access attribute
 in the private part of a generic unit.
 
-!corrigendum 3.3(23.9/3)
+!corrigendum 3.3(23)
+!comment A fake entry to force a conflict. The real text is in the conflict file. (includes 23.9 and 23.10)
 
 @drepl
 @xbullet<it is a dereference of a pool-specific access type, and there is no partial
@@ -311,26 +312,7 @@
 @xbullet<it is a dereference of a pool-specific access type, and there is
 no ancestor of its type that has a constrained partial view.>
 
-!corrigendum 3.3(23.10/3)
 
-@drepl
-For the purposes of determining within a generic body whether an object is known to be
-constrained, a subtype is not considered indefinite if it is a descendant of an untagged
-generic formal derived type, nor is an access type considered pool-specific if it is a
-descendant of a formal access type.
-@dby
-For the purposes of determining within a generic body whether an
-object is known to be constrained:
-
-@xbullet<if a subtype is a descendant of an untagged generic formal
-private or derived type, and the subtype is not an unconstrained array
-subtype, it is not considered indefinite and is considered to
-have a constrained partial view;>
-
-@xbullet<if a subtype is a descendant of a formal access type, it is not
-considered pool-specific.>
-
-
 !corrigendum 3.7.1(7/2)
 
 @drepl
@@ -376,14 +358,14 @@
 
 @drepl
 @xi2bull<@i<D> shall be discriminated in its full view and unconstrained in any 
-partial view, and the designated subtype of @i<A> shall be unconstrained.
+partial view, and the designated subtype of @i<A> shall be unconstrained.>
 @dby
 @xi2bull<@i<D> shall be discriminated in its full view and unconstrained in any 
 partial view, and the designated subtype of @i<A> shall be unconstrained.
 For the purposes of determining within a generic body whether @i<D> is
 unconstrained in any partial view, a discriminated subtype is
 considered to have a constrained partial view if it is a descendant
-of an untagged generic formal private or derived type.
+of an untagged generic formal private or derived type.>
 
 !corrigendum 3.10.2(28)