From 20efc54a47ddd62faeb483301c9cb28a968ca80e Mon Sep 17 00:00:00 2001
From: Simon Wright <simon@pushface.org>
Date: Mon, 10 May 2021 14:36:14 +0100
Subject: [PATCH] Workround for issue #729 (#731)

Updated rules in 3.10.2 and 6.4.1(6) caused the use of
Constant_Reference, which takes the Container as an aliased parameter,
to trip over its use on a container passed as an un-aliased parameter.

  * src/alire/alire-conditional_trees.ads (Root): replace
      Constant_Reference by Element.
  * src/alire/alire-dependencies-states.adb ("="): likewise.
  * src/alire/alire-conditional_trees.adb (To_YAML (1)): likewise.
    (Image_One_Line): likewise.
    (Iterate): replace Constant_Reference.Element.all by just Element.
---
 src/alire/alire-conditional_trees.adb   | 6 +++---
 src/alire/alire-conditional_trees.ads   | 2 +-
 src/alire/alire-dependencies-states.adb | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/alire/alire-conditional_trees.adb b/src/alire/alire-conditional_trees.adb
index f5c9e6c7..3811a488 100644
--- a/src/alire/alire-conditional_trees.adb
+++ b/src/alire/alire-conditional_trees.adb
@@ -22,7 +22,7 @@ package body Alire.Conditional_Trees is
    function To_YAML (This : Tree) return String
    is (if This.Is_Empty
        then ""
-       else This.Constant_Reference.To_YAML);
+       else This.Element.To_YAML);
 
    overriding
    function To_YAML (V : Leaf_Node) return String is
@@ -99,7 +99,7 @@ package body Alire.Conditional_Trees is
    function Image_One_Line (This : Tree) return String is
      (if This.Is_Empty
       then "(empty)"
-      else This.Constant_Reference.Image);
+      else This.Element.Image);
 
    ----------------------------
    -- All_But_First_Children --
@@ -615,7 +615,7 @@ package body Alire.Conditional_Trees is
 
       return Forward_Iterator'
         (Children =>
-           Vector_Node (Container.Constant_Reference.Element.all).Values);
+           Vector_Node (Container.Element).Values);
    end Iterate;
 
    ---------------------
diff --git a/src/alire/alire-conditional_trees.ads b/src/alire/alire-conditional_trees.ads
index d3c4c33d..977d3028 100644
--- a/src/alire/alire-conditional_trees.ads
+++ b/src/alire/alire-conditional_trees.ads
@@ -444,7 +444,7 @@ private
       else This.Root.Leaf_Count);
 
    function Root (This : Tree) return Node'Class is
-     (This.Constant_Reference);
+     (This.Element);
 
    procedure Tree_TOML_Add (Table : TOML.TOML_Value;
                             Key   : String;
diff --git a/src/alire/alire-dependencies-states.adb b/src/alire/alire-dependencies-states.adb
index 508db73a..73a5ddd6 100644
--- a/src/alire/alire-dependencies-states.adb
+++ b/src/alire/alire-dependencies-states.adb
@@ -15,9 +15,9 @@ package body Alire.Dependencies.States is
         or else
           (not L.Is_Empty and then not R.Is_Empty
            and then
-           L.Constant_Reference.Milestone = R.Constant_Reference.Milestone
+           L.Element.Milestone = R.Element.Milestone
            and then
-           L.Constant_Reference.Origin = R.Constant_Reference.Origin);
+           L.Element.Origin = R.Element.Origin);
    end "=";
 
    ----------------------
-- 
2.39.5