M agpl-generic_handle.adb

M agpl-generic_handle.ads M agpl-calendar-serializable_time.adb M agpl-calendar-serializable_time.ads
mosteo · Jul 12, 2006 · 970417d · 970417d
1 parent 95cdb09
commit 970417d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/agpl-calendar-serializable_time.adb b/agpl-calendar-serializable_time.adb
@@ -1,5 +1,14 @@
 package body Agpl.Calendar.Serializable_Time is
 
+   ---------
+   -- "+" --
+   ---------
+
+   function "+" (This : in Object) return Ada.Calendar.Time is
+   begin
+      return Ada.Calendar.Time (This);
+   end "+";
+
    ----------
    -- Read --
    ----------

diff --git a/agpl-calendar-serializable_time.ads b/agpl-calendar-serializable_time.ads
@@ -45,6 +45,9 @@ package Agpl.Calendar.Serializable_Time is
 
    type Object is new Ada.Calendar.Time;
 
+   function "+" (This : in Object) return Ada.Calendar.Time;
+   pragma Inline ("+");
+
    procedure Read (Stream : access Ada.Streams.Root_Stream_Type'Class;
                    This   :    out Object);
    for Object'Read use Read;

diff --git a/agpl-generic_handle.adb b/agpl-generic_handle.adb
@@ -35,7 +35,9 @@ package body Agpl.Generic_Handle is
 
    procedure Adjust (This : in out Object) is
    begin
-      This.Data := new Item'(This.Data.all);
+      if This.Data /= null then
+         This.Data := new Item'(This.Data.all);
+      end if;
    end Adjust;
 
    -----------
@@ -63,7 +65,8 @@ package body Agpl.Generic_Handle is
 
    function Set (This : in Item) return Object is
    begin
-      return (Ada.Finalization.Controlled with Data => new Item'(This));
+      return (Ada.Finalization.Controlled with
+              Data => new Item'(This));
    end Set;
 
    ---------

diff --git a/agpl-generic_handle.ads b/agpl-generic_handle.ads
@@ -36,7 +36,7 @@ package Agpl.Generic_Handle is
 
    pragma Preelaborate;
 
-   type Item_Access is access Item;
+   type Item_Access is access all Item;
 
    No_Data : exception;