Second sync

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,15 @@
+2025-04-24  Dirk Eddelbuettel  <edd@debian.org>
+
+	* DESCRIPTION (Version, Date): RcppArmadillo 14.4.1-3
+
+	* inst/include/armadillo_bits/: Sync again with Armadillo 14.4.2 rc
+
+2025-04-23  Dirk Eddelbuettel  <edd@debian.org>
+
+	* DESCRIPTION (Version, Date): RcppArmadillo 14.4.1-2
+
+	* inst/include/armadillo_bits/: Sync with Armadillo 14.4.2 rc
+
 2025-04-14  Dirk Eddelbuettel  <edd@debian.org>
 
 	* inst/tinytest/test_sparse.R: Remove a redundant duplicate require

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 14.4.1-1
-Date: 2025-03-27
+Version: 14.4.1-3
+Date: 2025-04-24
 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org",
                     comment = c(ORCID = "0000-0001-6419-907X")),
              person("Romain", "Francois", role = "aut",

inst/include/armadillo_bits/op_sp_sum_bones.hpp

@@ -25,11 +25,11 @@ class op_sp_sum
   {
   public:
 
-  template<typename T1>
-  inline static void apply(Mat<typename T1::elem_type>& out, const mtSpReduceOp<typename T1::elem_type, T1, op_sp_sum>& in);
+  template<typename eT, typename T1>
+  inline static void apply(Mat<eT>& out, const mtSpReduceOp<eT, T1, op_sp_sum>& in);
 
-  template<typename T1>
-  inline static void apply(Mat<typename T1::elem_type>& out, const mtSpReduceOp<typename T1::elem_type, SpOp<T1, spop_square>, op_sp_sum>& in);
+  template<typename eT, typename T1>
+  inline static void apply(Mat<eT>& out, const mtSpReduceOp<eT, SpOp<T1, spop_square>, op_sp_sum>& in);
   };
 
 

inst/include/armadillo_bits/op_sp_sum_meat.hpp

@@ -21,14 +21,14 @@
 
 
 
-template<typename T1>
+template<typename eT, typename T1>
 inline
 void
-op_sp_sum::apply(Mat<typename T1::elem_type>& out, const mtSpReduceOp<typename T1::elem_type, T1, op_sp_sum>& in)
+op_sp_sum::apply(Mat<eT>& out, const mtSpReduceOp<eT, T1, op_sp_sum>& in)
   {
   arma_debug_sigprint();
 
-  typedef typename T1::elem_type eT;
+  // NOTE: assuming that eT is the same as T1::elem_type
 
   const uword dim = in.aux_uword_a;
 
@@ -83,14 +83,14 @@ op_sp_sum::apply(Mat<typename T1::elem_type>& out, const mtSpReduceOp<typename T
 
 
 
-template<typename T1>
+template<typename eT, typename T1>
 inline
 void
-op_sp_sum::apply(Mat<typename T1::elem_type>& out, const mtSpReduceOp<typename T1::elem_type, SpOp<T1, spop_square>, op_sp_sum>& in)
+op_sp_sum::apply(Mat<eT>& out, const mtSpReduceOp<eT, SpOp<T1, spop_square>, op_sp_sum>& in)
   {
   arma_debug_sigprint();
 
-  typedef typename T1::elem_type eT;
+  // NOTE: assuming that eT is the same as T1::elem_type
 
   const uword dim = in.aux_uword_a;