a-cohase.ads, [...] (Cursor'Read, [...]): Declare in private part.

2012-01-23  Matthew Heaney  <heaney@adacore.com>

	* a-cohase.ads, a-cihase.ads, a-cbhase.ads, a-coorse.ads,
	a-ciorse.ads, a-cborse.ads, a-cohama.ads, a-cihama.ads, a-cbhama.ads,
	a-coorma.ads, a-ciorma.ads, a-cborma.ads, a-cdlili.ads, a-cidlli.ads,
	a-cbdlli.ads, a-convec.ads, a-coinve.ads, a-cobove.ads (Cursor'Read,
	Cursor'Write): Declare in private part.
	(Reference_Type'Read, Reference_Type'Write): Ditto.
	(Constant_Reference_Type'Read, Constant_Reference_Type'Write): Ditto.

From-SVN: r183418

1 files changed, 29 insertions, 26 deletions

diff --git a/gcc/ada/a-coorse.ads b/gcc/ada/a-coorse.ads
index cf28a7c..540da1a 100644
--- a/gcc/ada/a-coorse.ads
+++ b/gcc/ada/a-coorse.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2004-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 2004-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -31,11 +31,11 @@
 -- This unit was originally developed by Matthew J Heaney.                  --
 ------------------------------------------------------------------------------
 
+with Ada.Iterator_Interfaces;
+
 private with Ada.Containers.Red_Black_Trees;
 private with Ada.Finalization;
-
-with Ada.Streams; use Ada.Streams;
-with Ada.Iterator_Interfaces;
+private with Ada.Streams;
 
 generic
    type Element_Type is private;
@@ -97,22 +97,10 @@ package Ada.Containers.Ordered_Sets is
    with
       Implicit_Dereference => Element;
 
-   procedure Write
-     (Stream : not null access Root_Stream_Type'Class;
-      Item   : Constant_Reference_Type);
-
-   for Constant_Reference_Type'Write use Write;
-
    function Constant_Reference
      (Container : aliased Set;
       Position  : Cursor) return Constant_Reference_Type;
 
-   procedure Read
-     (Stream : not null access Root_Stream_Type'Class;
-      Item   : out Constant_Reference_Type);
-
-   for Constant_Reference_Type'Read use Read;
-
    procedure Assign (Target : in out Set; Source : Set);
 
    function Copy (Source : Set) return Set;
@@ -292,6 +280,8 @@ package Ada.Containers.Ordered_Sets is
       type Reference_Type
          (Element : not null access Element_Type) is null record;
 
+      use Ada.Streams;
+
       procedure Write
         (Stream : not null access Root_Stream_Type'Class;
          Item   : Reference_Type);
@@ -335,6 +325,19 @@ private
    use Red_Black_Trees;
    use Tree_Types;
    use Ada.Finalization;
+   use Ada.Streams;
+
+   procedure Write
+     (Stream    : not null access Root_Stream_Type'Class;
+      Container : Set);
+
+   for Set'Write use Write;
+
+   procedure Read
+     (Stream    : not null access Root_Stream_Type'Class;
+      Container : out Set);
+
+   for Set'Read use Read;
 
    type Set_Access is access all Set;
    for Set_Access'Storage_Size use 0;
@@ -356,22 +359,20 @@ private
 
    for Cursor'Read use Read;
 
-   No_Element : constant Cursor := Cursor'(null, null);
+   type Constant_Reference_Type
+      (Element : not null access constant Element_Type) is null record;
 
    procedure Write
-     (Stream    : not null access Root_Stream_Type'Class;
-      Container : Set);
+     (Stream : not null access Root_Stream_Type'Class;
+      Item   : Constant_Reference_Type);
 
-   for Set'Write use Write;
+   for Constant_Reference_Type'Write use Write;
 
    procedure Read
-     (Stream    : not null access Root_Stream_Type'Class;
-      Container : out Set);
-
-   for Set'Read use Read;
+     (Stream : not null access Root_Stream_Type'Class;
+      Item   : out Constant_Reference_Type);
 
-   type Constant_Reference_Type
-      (Element : not null access constant Element_Type) is null record;
+   for Constant_Reference_Type'Read use Read;
 
    Empty_Set : constant Set :=
                  (Controlled with Tree => (First  => null,
@@ -381,4 +382,6 @@ private
                                            Busy   => 0,
                                            Lock   => 0));
 
+   No_Element : constant Cursor := Cursor'(null, null);
+
 end Ada.Containers.Ordered_Sets;