2012-02-20 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk rev 184385 using svnmerge



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@184387 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 16 insertions, 1 deletions

diff --git a/gcc/ada/a-cihase.ads b/gcc/ada/a-cihase.ads
index f361830b78b..b300186f6db 100644
--- a/gcc/ada/a-cihase.ads
+++ b/gcc/ada/a-cihase.ads
@@ -152,6 +152,7 @@ package Ada.Containers.Indefinite_Hashed_Sets is
    function Constant_Reference
      (Container : aliased Set;
       Position  : Cursor) return Constant_Reference_Type;
+   pragma Inline (Constant_Reference);
 
    procedure Assign (Target : in out Set; Source : Set);
 
@@ -507,8 +508,22 @@ private
 
    for Cursor'Read use Read;
 
+   type Reference_Control_Type is
+      new Controlled with record
+         Container : Set_Access;
+      end record;
+
+   overriding procedure Adjust (Control : in out Reference_Control_Type);
+   pragma Inline (Adjust);
+
+   overriding procedure Finalize (Control : in out Reference_Control_Type);
+   pragma Inline (Finalize);
+
    type Constant_Reference_Type
-     (Element : not null access constant Element_Type) is null record;
+     (Element : not null access constant Element_Type) is
+      record
+         Control : Reference_Control_Type;
+      end record;
 
    procedure Read
      (Stream : not null access Root_Stream_Type'Class;