From e12a2245c1b61f025721ba02c47283e208e203af Mon Sep 17 00:00:00 2001
From: Steffen Neumann <sneumann@ipb-halle.de>
Date: Mon, 18 Mar 2024 12:52:50 +0100
Subject: [PATCH] Fix compilation on Windows/aarch64 (closes #290)

---
 DESCRIPTION                                            |  2 +-
 NEWS                                                   |  4 ++++
 src/boost/nowide/iostream.hpp                          |  2 +-
 .../numeric/conversion/detail/int_float_mixture.hpp    | 10 +++++-----
 src/boost/numeric/conversion/detail/sign_mixture.hpp   | 10 +++++-----
 .../numeric/conversion/detail/udt_builtin_mixture.hpp  | 10 +++++-----
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 588d5f5fb..a57e10c99 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: mzR
 Type: Package
 Title: parser for netCDF, mzXML and mzML and mzIdentML files
        (mass spectrometry data)
-Version: 2.37.2
+Version: 2.37.3
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou, Johannes Rainer
 Authors@R: c(
     person("Steffen", "Neumann", email="sneumann@ipb-halle.de", role=c("aut","cre")),
diff --git a/NEWS b/NEWS
index c52a19193..b51734c7e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+CHANGES IN VERSION 2.37.3
+-------------------------
+o Fix compilation on Windows/aarch64 (#290), thanks to Tomas Kalibera for the patch
+
 CHANGES IN VERSION 2.37.2
 -------------------------
 o remove mentions of mzData in the DESCRIPTION, vignette and manual
diff --git a/src/boost/nowide/iostream.hpp b/src/boost/nowide/iostream.hpp
index 7c9db93de..5196a73e0 100755
--- a/src/boost/nowide/iostream.hpp
+++ b/src/boost/nowide/iostream.hpp
@@ -52,7 +52,7 @@ namespace nowide {
         class BOOST_NOWIDE_DECL winconsole_istream : public std::istream
         {
         public:
-            explicit winconsole_istream(winconsole_ostream* tieStream);
+            explicit winconsole_istream(winconsole_ostream* tieStream=0);
             ~winconsole_istream();
 
         private:
diff --git a/src/boost/numeric/conversion/detail/int_float_mixture.hpp b/src/boost/numeric/conversion/detail/int_float_mixture.hpp
index 464e52753..7690d07a2 100755
--- a/src/boost/numeric/conversion/detail/int_float_mixture.hpp
+++ b/src/boost/numeric/conversion/detail/int_float_mixture.hpp
@@ -16,15 +16,15 @@
 #include "boost/numeric/conversion/int_float_mixture_enum.hpp"
 #include "boost/numeric/conversion/detail/meta.hpp"
 
-#include "boost/mpl/integral_c.hpp"
+#include "boost/type_traits/integral_constant.hpp"
 
 namespace boost { namespace numeric { namespace convdetail
 {
   // Integral Constants for 'IntFloatMixture'
-  typedef mpl::integral_c<int_float_mixture_enum, integral_to_integral> int2int_c ;
-  typedef mpl::integral_c<int_float_mixture_enum, integral_to_float>    int2float_c ;
-  typedef mpl::integral_c<int_float_mixture_enum, float_to_integral>    float2int_c ;
-  typedef mpl::integral_c<int_float_mixture_enum, float_to_float>       float2float_c ;
+  typedef boost::integral_constant<int_float_mixture_enum, integral_to_integral> int2int_c ;
+  typedef boost::integral_constant<int_float_mixture_enum, integral_to_float>    int2float_c ;
+  typedef boost::integral_constant<int_float_mixture_enum, float_to_integral>    float2int_c ;
+  typedef boost::integral_constant<int_float_mixture_enum, float_to_float>       float2float_c ;
 
   // Metafunction:
   //
diff --git a/src/boost/numeric/conversion/detail/sign_mixture.hpp b/src/boost/numeric/conversion/detail/sign_mixture.hpp
index c7f9e42af..fde158409 100755
--- a/src/boost/numeric/conversion/detail/sign_mixture.hpp
+++ b/src/boost/numeric/conversion/detail/sign_mixture.hpp
@@ -16,15 +16,15 @@
 #include "boost/numeric/conversion/sign_mixture_enum.hpp"
 #include "boost/numeric/conversion/detail/meta.hpp"
 
-#include "boost/mpl/integral_c.hpp"
+#include "boost/type_traits/integral_constant.hpp"
 
 namespace boost { namespace numeric { namespace convdetail
 {
   // Integral Constants for 'SignMixture'
-  typedef mpl::integral_c<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ;
-  typedef mpl::integral_c<sign_mixture_enum, signed_to_signed>     sig2sig_c ;
-  typedef mpl::integral_c<sign_mixture_enum, signed_to_unsigned>   sig2unsig_c ;
-  typedef mpl::integral_c<sign_mixture_enum, unsigned_to_signed>   unsig2sig_c ;
+  typedef boost::integral_constant<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ;
+  typedef boost::integral_constant<sign_mixture_enum, signed_to_signed>     sig2sig_c ;
+  typedef boost::integral_constant<sign_mixture_enum, signed_to_unsigned>   sig2unsig_c ;
+  typedef boost::integral_constant<sign_mixture_enum, unsigned_to_signed>   unsig2sig_c ;
 
   // Metafunction:
   //
diff --git a/src/boost/numeric/conversion/detail/udt_builtin_mixture.hpp b/src/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
index 36dbc491b..a39d29fd2 100755
--- a/src/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
+++ b/src/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
@@ -15,15 +15,15 @@
 #include "boost/numeric/conversion/udt_builtin_mixture_enum.hpp"
 #include "boost/numeric/conversion/detail/meta.hpp"
 
-#include "boost/mpl/integral_c.hpp"
+#include "boost/type_traits/integral_constant.hpp"
 
 namespace boost { namespace numeric { namespace convdetail
 {
   // Integral Constants for 'UdtMixture'
-  typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ;
-  typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_udt>     builtin2udt_c ;
-  typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_builtin>     udt2builtin_c ;
-  typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_udt>         udt2udt_c ;
+  typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ;
+  typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_udt>     builtin2udt_c ;
+  typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_builtin>     udt2builtin_c ;
+  typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_udt>         udt2udt_c ;
 
   // Metafunction:
   //