CVS difference for ais/conflict.txt

Differences between 1.5 and version 1.6
Log of other versions for file ais/conflict.txt

--- ais/conflict.txt	2000/04/20 20:20:13	1.5
+++ ais/conflict.txt	2000/06/22 23:29:24	1.6
@@ -117,19 +117,19 @@
 or Storage_Error is raised, or that the call results in infinite recursion.
 
 !corrigendum 13.01(11)
-!AI-00117
 !AI-00137
+!AI-00117
 
 @drepl
 Representation aspects of a generic formal parameter are the same as
 those of the actual. A type-related representation item is not allowed for a
 descendant of a generic formal untagged type.
 @dby
-Representation aspects of a generic formal parameter are the same as
-those of the actual. Representation aspects of a partial view are the same
-as those of the full view. A type-related representation item, other than the
-stream-oriented attributes Read, Write, Input, and Output, is not allowed
-for a descendant of a generic formal untagged type.
+Operational and representation aspects of a generic formal parameter are the
+same as those of the actual. Operational and representation aspects of a
+partial view are the same as those of the full view. A type-related
+representation item is not allowed for a descendant of a generic formal
+untagged type.
 
 !corrigendum 13.12(9)
 !AI-00130
@@ -150,8 +150,8 @@
 that every execution of the partition would violate the restriction.
 
 !corrigendum A.12.01 (36)
-!AI-00001
 !AI-00026
+!AI-00001
 
 @drepl
 The Flush procedure synchronizes the external file with the internal file (by

Questions? Ask the ACAA Technical Agent