a-cidlli.ads, [...] (Empty_Vector, [...]): Move this object declaration after freezing point of all its associated tagged...

2007-04-20  Javier Miranda  <miranda@adacore.com>

	* a-cidlli.ads, a-cdlili.ads, a-cohama.ads, a-coinve.ads, 
	a-convec.ads (Empty_Vector, Empty_Map, Empty_List): Move this object
	declaration after freezing point of all its associated tagged types;
	otherwise such types are frozen too early.

From-SVN: r125477

5 files changed, 10 insertions, 10 deletions

diff --git a/gcc/ada/a-cdlili.ads b/gcc/ada/a-cdlili.ads
index c5d81f7..06603cb 100644
--- a/gcc/ada/a-cdlili.ads
+++ b/gcc/ada/a-cdlili.ads
@@ -243,8 +243,6 @@ private
 
    for List'Write use Write;
 
-   Empty_List : constant List := (Controlled with null, null, 0, 0, 0);
-
    type List_Access is access constant List;
    for List_Access'Storage_Size use 0;
 
@@ -266,6 +264,8 @@ private
 
    for Cursor'Write use Write;
 
+   Empty_List : constant List := (Controlled with null, null, 0, 0, 0);
+
    No_Element : constant Cursor := Cursor'(null, null);
 
 end Ada.Containers.Doubly_Linked_Lists;
diff --git a/gcc/ada/a-cidlli.ads b/gcc/ada/a-cidlli.ads
index ff354cc..178709e 100644
--- a/gcc/ada/a-cidlli.ads
+++ b/gcc/ada/a-cidlli.ads
@@ -236,8 +236,6 @@ private
 
    for List'Write use Write;
 
-   Empty_List : constant List := List'(Controlled with null, null, 0, 0, 0);
-
    type List_Access is access constant List;
    for List_Access'Storage_Size use 0;
 
@@ -259,6 +257,8 @@ private
 
    for Cursor'Write use Write;
 
+   Empty_List : constant List := List'(Controlled with null, null, 0, 0, 0);
+
    No_Element : constant Cursor := Cursor'(null, null);
 
 end Ada.Containers.Indefinite_Doubly_Linked_Lists;
diff --git a/gcc/ada/a-cohama.ads b/gcc/ada/a-cohama.ads
index a0bbad4..d03d741 100644
--- a/gcc/ada/a-cohama.ads
+++ b/gcc/ada/a-cohama.ads
@@ -203,8 +203,6 @@ private
 
    for Map'Read use Read;
 
-   Empty_Map : constant Map := (Controlled with HT => (null, 0, 0, 0));
-
    type Map_Access is access constant Map;
    for Map_Access'Storage_Size use 0;
 
@@ -226,6 +224,8 @@ private
 
    for Cursor'Write use Write;
 
+   Empty_Map : constant Map := (Controlled with HT => (null, 0, 0, 0));
+
    No_Element : constant Cursor := (Container => null, Node => null);
 
 end Ada.Containers.Hashed_Maps;
diff --git a/gcc/ada/a-coinve.ads b/gcc/ada/a-coinve.ads
index 317dc75..0bfbd42 100644
--- a/gcc/ada/a-coinve.ads
+++ b/gcc/ada/a-coinve.ads
@@ -337,8 +337,6 @@ private
 
    for Vector'Read use Read;
 
-   Empty_Vector : constant Vector := (Controlled with null, No_Index, 0, 0);
-
    type Vector_Access is access constant Vector;
    for Vector_Access'Storage_Size use 0;
 
@@ -359,6 +357,8 @@ private
 
    for Cursor'Read use Read;
 
+   Empty_Vector : constant Vector := (Controlled with null, No_Index, 0, 0);
+
    No_Element : constant Cursor := Cursor'(null, Index_Type'First);
 
 end Ada.Containers.Indefinite_Vectors;
diff --git a/gcc/ada/a-convec.ads b/gcc/ada/a-convec.ads
index bceea17..dbb3cc4 100644
--- a/gcc/ada/a-convec.ads
+++ b/gcc/ada/a-convec.ads
@@ -345,8 +345,6 @@ private
 
    for Vector'Read use Read;
 
-   Empty_Vector : constant Vector := (Controlled with null, No_Index, 0, 0);
-
    type Vector_Access is access constant Vector;
    for Vector_Access'Storage_Size use 0;
 
@@ -367,6 +365,8 @@ private
 
    for Cursor'Read use Read;
 
+   Empty_Vector : constant Vector := (Controlled with null, No_Index, 0, 0);
+
    No_Element : constant Cursor := Cursor'(null, Index_Type'First);
 
 end Ada.Containers.Vectors;