From 8d9b029570e149451299e81b56bfaa8364101569 Mon Sep 17 00:00:00 2001
From: Vakhtang Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Wed, 11 Dec 2024 19:01:48 +0100
Subject: [PATCH] ExpressionEvaluator/exprtk.hpp: fixed compilation errors with
 Clang19

---
 .../ExpressionEvaluator/exprtk.hpp            | 22 +++++++++----------
 athena_ci/ci.yml                              |  2 ++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/GeoModelTools/ExpressionEvaluator/ExpressionEvaluator/exprtk.hpp b/GeoModelTools/ExpressionEvaluator/ExpressionEvaluator/exprtk.hpp
index 03751890d..79117df6e 100644
--- a/GeoModelTools/ExpressionEvaluator/ExpressionEvaluator/exprtk.hpp
+++ b/GeoModelTools/ExpressionEvaluator/ExpressionEvaluator/exprtk.hpp
@@ -6340,7 +6340,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -6400,7 +6400,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -6463,7 +6463,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -6507,7 +6507,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -7782,7 +7782,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(index_, node_delete_list);
+            expression_node<T>::ndb_t::collect(index_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -11992,7 +11992,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -15283,7 +15283,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -15339,7 +15339,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -15406,7 +15406,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -15473,7 +15473,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
@@ -16040,7 +16040,7 @@ namespace exprtk
 
          void collect_nodes(typename expression_node<T>::noderef_list_t& node_delete_list)
          {
-            expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
+            expression_node<T>::ndb_t::collect(branch_, node_delete_list);
          }
 
          std::size_t node_depth() const
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index 52f2cdda0..3d56cbd6f 100644
--- a/athena_ci/ci.yml
+++ b/athena_ci/ci.yml
@@ -7,6 +7,7 @@ build_geomodel_athena:
       changes:
       - GeoModelCore/**/*
       - GeoModelIO/**/*
+      - GeoModelTools/**/*
       - cmake/**/*
       - CMakeLists.txt
 
@@ -60,6 +61,7 @@ build_geomodel_athena:
       changes:
       - GeoModelCore/**/*
       - GeoModelIO/**/*
+      - GeoModelTools/**/*
       - cmake/**/*
       - CMakeLists.txt
 
-- 
GitLab