M agpl-containers-bulk.ads

M    agpl-conversions.adb
M    agpl-conversions.ads
M    agpl.gpr
M    agpl-htn-tasks-containers.ads
M    agpl-cr-mutable_assignment.adb
M    agpl-cr-mutable_assignment.ads
M    agpl-cr-agent-containers.ads

agpl-containers-bulk.ads

@@ -27,19 +27,25 @@
 --  Massive instantiation of containers
 
 with Ada.Containers.Indefinite_Doubly_Linked_Lists;
+with Ada.Containers.Indefinite_Ordered_Maps;
 with Ada.Containers.Indefinite_Vectors;
 
 generic
    type Element_Type (<>) is private;
    with function "=" (Left, Right : Element_Type) return Boolean is <>;
    type Index_Type is range <>;
+   type Key_Type (<>) is private;
+   with function "<" (Left, Right : Key_Type) return Boolean is <>;
 package Agpl.Containers.Bulk is
 
    pragma Preelaborate;
 
    package Lists is new Ada.Containers.Indefinite_Doubly_Linked_Lists
      (Element_Type);
 
+   package Maps is new Ada.Containers.Indefinite_Ordered_Maps
+     (Key_Type, Element_Type);
+
    package Vectors is new Ada.Containers.Indefinite_Vectors
      (Index_Type, Element_Type);
 

agpl-conversions.adb

@@ -43,6 +43,14 @@ with System.Img_Real; use System.Img_Real;
 
 package body Agpl.Conversions is
 
+   ------------------------------------------------------------------------
+   -- Trim                                                               --
+   ------------------------------------------------------------------------
+   function Trim (This : in String) return String is
+   begin
+      return Ada.Strings.Fixed.Trim (This, Ada.Strings.Both);
+   end Trim;
+
    ------------------------------------------------------------------------
    -- From_Hex                                                           --
    ------------------------------------------------------------------------
@@ -147,12 +155,4 @@ package body Agpl.Conversions is
       end if;
    end To_Str;
 
-   ------------------------------------------------------------------------
-   -- Trim                                                               --
-   ------------------------------------------------------------------------
-   function Trim (This : in String) return String is
-   begin
-      return Ada.Strings.Fixed.Trim (This, Ada.Strings.Both);
-   end Trim;
-
 end Agpl.Conversions;

agpl-conversions.ads

@@ -66,6 +66,6 @@ package Agpl.Conversions is
                     return     String;
 
    function Trim (This : in String) return String;
-   pragma Inline (Trim);
+--   pragma Inline (Trim);
 
 end Agpl.Conversions;

agpl-cr-agent-containers.ads

@@ -31,6 +31,7 @@ with Agpl.Containers.Bulk;
 package Agpl.Cr.Agent.Containers is
 new Agpl.Containers.Bulk (Object'Class,
                           "=",
-                          Positive);
+                          Positive,
+                          String, "<");
 
 pragma Preelaborate (Agpl.Cr.Agent.Containers);