From 8a6ea41cd7c51c78377b2928578a33af6f3f74b5 Mon Sep 17 00:00:00 2001
From: Matthias Wittgen <matthias.michael.wittgen@cern.ch>
Date: Sat, 28 Feb 2026 15:31:13 -0800
Subject: [PATCH] Fix compiltation issues

---
 CHANGELOG.md                | 6 ++++++
 include/ndarray/ArrayBase.h | 6 +-----
 include/ndarray/Vector.h    | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e350d59f..ba990912 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ndarray change log
 
+## 1.5.2
+
+### Bug fixes
+
+Fix compilation issues with newer compiler versions.
+
 ## 1.5.1
 
 ### Bug fixes
diff --git a/include/ndarray/ArrayBase.h b/include/ndarray/ArrayBase.h
index 79325028..085a44c0 100644
--- a/include/ndarray/ArrayBase.h
+++ b/include/ndarray/ArrayBase.h
@@ -85,11 +85,7 @@ class ArrayBase : public ExpressionBase<Derived> {
 
     /// @brief Return a single element from the array.
     Element & operator[](Index const & i) const {
-        return *(this->_data + this->_core->
-			#ifndef _MSC_VER
-			template
-			#endif
-			computeOffset(i));
+        return *(this->_data + this->_core->computeOffset(i));
     }
 
     /// @brief Return an Iterator to the beginning of the array.
diff --git a/include/ndarray/Vector.h b/include/ndarray/Vector.h
index f8e476c6..13e6cb07 100644
--- a/include/ndarray/Vector.h
+++ b/include/ndarray/Vector.h
@@ -17,6 +17,7 @@
 #include <boost/type_traits/is_arithmetic.hpp>
 #include <boost/iterator/reverse_iterator.hpp>
 #include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_convertible.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/preprocessor/repetition/repeat.hpp>
 #include <boost/preprocessor/repetition/repeat_from_to.hpp>