From 614efb43ec376c7c5709e9d771a68fef5e9081db Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Mon, 20 Oct 2025 15:07:15 -0500
Subject: [PATCH] Fix ROOT dictionary generation errors by including typename
 keyword in type aliases.

---
 Fit/Track.hh                      |  2 +-
 Trajectory/PiecewiseTrajectory.hh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Fit/Track.hh b/Fit/Track.hh
index 1109f941..2230912a 100644
--- a/Fit/Track.hh
+++ b/Fit/Track.hh
@@ -324,7 +324,7 @@ namespace KinKal {
       // find the range of existing ptraj pieces that overlaps with this domain's range
       using KTRAJPTR = std::shared_ptr<KTRAJ>;
       using DKTRAJ = std::deque<KTRAJPTR>;
-      using DKTRAJCITER = DKTRAJ::const_iterator;
+      using DKTRAJCITER = typename DKTRAJ::const_iterator;
       DKTRAJCITER first,last;
       fittraj_->pieceRange(domain->range(),first,last);
       // loop over these pieces
diff --git a/Trajectory/PiecewiseTrajectory.hh b/Trajectory/PiecewiseTrajectory.hh
index e7c6aa30..4d9cb365 100644
--- a/Trajectory/PiecewiseTrajectory.hh
+++ b/Trajectory/PiecewiseTrajectory.hh
@@ -21,8 +21,8 @@ namespace KinKal {
     public:
       using KTRAJPTR = std::shared_ptr<KTRAJ>;
       using DKTRAJ = std::deque<KTRAJPTR>;
-      using DKTRAJITER = DKTRAJ::iterator;
-      using DKTRAJCITER = DKTRAJ::const_iterator;
+      using DKTRAJITER = typename DKTRAJ::iterator;
+      using DKTRAJCITER = typename DKTRAJ::const_iterator;
       // forward calls to the pieces
       VEC3 position3(double time) const { return nearestPiece(time).position3(time); }
       VEC3 velocity(double time) const { return nearestPiece(time).velocity(time); }
@@ -283,8 +283,8 @@ namespace KinKal {
   }
 
   template <class KTRAJ> void PiecewiseTrajectory<KTRAJ>::pieceRange(TimeRange const& range,
-      std::deque<std::shared_ptr<KTRAJ>>::const_iterator& first,
-      std::deque<std::shared_ptr<KTRAJ>>::const_iterator& last ) const {
+      typename std::deque<std::shared_ptr<KTRAJ>>::const_iterator &first,
+      typename std::deque<std::shared_ptr<KTRAJ>>::const_iterator &last) const {
     first = last = pieces_.end();
     // check for no overlap
     if(this->range().overlaps(range)){
@@ -298,8 +298,8 @@ namespace KinKal {
   }
 
   template <class KTRAJ> void PiecewiseTrajectory<KTRAJ>::pieceRange(TimeRange const& range,
-      std::deque<std::shared_ptr<KTRAJ>>::iterator& first,
-      std::deque<std::shared_ptr<KTRAJ>>::iterator& last) {
+      typename std::deque<std::shared_ptr<KTRAJ>>::iterator &first,
+      typename std::deque<std::shared_ptr<KTRAJ>>::iterator &last) {
     first = last = pieces_.end();
     // check for no overlap
     if(this->range().overlaps(range)){