diff mbox

[Ada] Dependency between System.Finalization_Root and Ada.Streams

Message ID 20120426095954.GA6758@adacore.com
State New
Headers show

Commit Message

Arnaud Charlet April 26, 2012, 9:59 a.m. UTC 
This patch modifies System.Finalization_Root to avoid a dependency on streams.
Type Root_Controlled is now abstract tagged null record.

Tested on x86_64-pc-linux-gnu, committed on trunk

2012-04-26  Hristian Kirtchev  <kirtchev@adacore.com>

	* s-finroo.ads: Remove with clause for
	Ada.Streams. Type Root_Controlled is now abstract tagged null
	record. Remove internal package Stream_Attributes. Root_Controlled
	doesn't need stream attribute redeclaration and avoids the
	dependency on streams.
diff mbox

Patch

Index: s-finroo.ads
===================================================================
--- s-finroo.ads	(revision 186860)
+++ s-finroo.ads	(working copy)
@@ -6,7 +6,7 @@ 
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -31,30 +31,16 @@ 
 
 --  This unit provides the basic support for controlled (finalizable) types
 
-with Ada.Streams;
-
 package System.Finalization_Root is
    pragma Preelaborate;
 
    --  The base for types Controlled and Limited_Controlled declared in Ada.
    --  Finalization.
 
-   type Root_Controlled is tagged null record;
+   type Root_Controlled is abstract tagged null record;
 
    procedure Adjust     (Object : in out Root_Controlled);
    procedure Finalize   (Object : in out Root_Controlled);
    procedure Initialize (Object : in out Root_Controlled);
 
-   package Stream_Attributes is
-      procedure Read
-        (Stream : not null access Ada.Streams.Root_Stream_Type'Class;
-         Item   : out Root_Controlled) is null;
-
-      procedure Write
-        (Stream : not null access Ada.Streams.Root_Stream_Type'Class;
-         Item   : Root_Controlled) is null;
-   end Stream_Attributes;
-
-   for Root_Controlled'Read  use Stream_Attributes.Read;
-   for Root_Controlled'Write use Stream_Attributes.Write;
 end System.Finalization_Root;