Release 14.3.91-1 synced with 14.3.91

Author: eddelbuettel

ChangeLog

@@ -1,5 +1,13 @@
+2025-02-13  Dirk Eddelbuettel  <[email protected]>
+
+	* inst/include/armadillo_bits/: Sync again with updated sources for
+	Armadillo 14.3.91 as a RC for 14.4.*
+
 2025-02-11  Dirk Eddelbuettel  <[email protected]>
 
+	* inst/include/armadillo_bits/: Sync again with updated sources for
+	Armadillo 14.3.90 as a RC for 14.4.*
+
 	* R/RcppArmadillo.package.skeleton.R: Generalise helper function to
 	support additional DESCRIPTION fields
 	* man/RcppArmadillo.package.skeleton.Rd: Document

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 14.3.90-1
-Date: 2025-02-10
+Version: 14.3.91-1
+Date: 2025-02-13
 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
                     comment = c(ORCID = "0000-0001-6419-907X")),
              person("Romain", "Francois", role = "aut",

inst/include/armadillo_bits/Mat_meat.hpp

@@ -474,9 +474,9 @@ Mat<eT>::Mat(const char* text)
 
   init( std::string(text) );
   }
-  
-  
-  
+
+
+
 //! create the matrix from a textual description
 template<typename eT>
 inline
@@ -489,8 +489,8 @@ Mat<eT>::operator=(const char* text)
 
   return *this;
   }
-  
-  
+
+
 
 //! create the matrix from a textual description
 template<typename eT>
@@ -508,9 +508,9 @@ Mat<eT>::Mat(const std::string& text)
 
   init(text);
   }
-  
-  
-  
+
+
+
 //! create the matrix from a textual description
 template<typename eT>
 inline

inst/include/armadillo_bits/arma_version.hpp

@@ -23,8 +23,8 @@
 
 #define ARMA_VERSION_MAJOR 14
 #define ARMA_VERSION_MINOR 3
-#define ARMA_VERSION_PATCH 90
-#define ARMA_VERSION_NAME  "unstable"
+#define ARMA_VERSION_PATCH 91
+#define ARMA_VERSION_NAME  "14.4-RC1"
 
 
 

inst/include/armadillo_bits/fn_accu.hpp

@@ -288,7 +288,7 @@ accu(const eOp<T1,eop_square>& expr)
 
   if((is_Mat<expr_P_stored_type>::value) || (is_subview_col<expr_P_stored_type>::value))
     {
-    const quasi_unwrap<T1> U(expr.P.Q);
+    const quasi_unwrap<expr_P_stored_type> U(expr.P.Q);
 
     const eT* X_mem = U.M.memptr();
 
@@ -987,8 +987,8 @@ accu(const eGlueCube<T1,T2,eglue_schur>& expr)
 
   typedef eGlueCube<T1,T2,eglue_schur> expr_type;
 
-  typedef typename expr_type::proxy_type::stored_type P1_stored_type;
-  typedef typename expr_type::proxy_type::stored_type P2_stored_type;
+  typedef typename expr_type::proxy1_type::stored_type P1_stored_type;
+  typedef typename expr_type::proxy2_type::stored_type P2_stored_type;
 
   if(is_Cube<P1_stored_type>::value && is_Cube<P2_stored_type>::value)
     {

inst/include/armadillo_bits/fn_conv_to.hpp

@@ -28,6 +28,9 @@ class conv_to
   {
   public:
 
+  template<typename in_eT>
+  arma_frown("use as_scalar() instead") inline static out_eT from(const in_eT& in, const typename arma_scalar_only<in_eT>::result* junk = nullptr);
+  
   template<typename in_eT, typename T1>
   arma_frown("use as_scalar() instead") inline static out_eT from(const Base<in_eT, T1>& in, const typename arma_not_cx<in_eT>::result* junk = nullptr);
 
@@ -43,6 +46,26 @@ class conv_to
 
 
 
+template<typename out_eT>
+template<typename in_eT>
+arma_warn_unused
+inline
+out_eT
+conv_to<out_eT>::from(const in_eT& in, const typename arma_scalar_only<in_eT>::result* junk)
+  {
+  arma_debug_sigprint();
+  arma_ignore(junk);
+  
+  arma_type_check(( is_supported_elem_type<out_eT>::value == false ));
+  
+  // NOTE: this is meant only as a workaround for old user code;
+  // NOTE: it doesn't handle conversions from complex to real
+  
+  return out_eT(in);
+  }
+
+
+
 template<typename out_eT>
 template<typename in_eT, typename T1>
 arma_warn_unused

inst/include/armadillo_bits/fn_elem.hpp

@@ -603,6 +603,20 @@ sqrt(const T1& A)
 
 
 
+// workaround for old user code
+template<typename eT>
+arma_frown("use std::sqrt(arma::as_scalar(X)) instead")
+inline
+typename arma_scalar_only<eT>::result
+sqrt(const eT& A)
+  {
+  arma_debug_sigprint();
+  
+  return eop_aux::sqrt(A);
+  }
+
+
+
 template<typename T1>
 arma_warn_unused
 arma_inline
@@ -767,6 +781,20 @@ pow(const T1& A, const typename T1::elem_type exponent)
 
 
 
+// workaround for old user code
+template<typename eT>
+arma_frown("use std::pow(arma::as_scalar(X),Y) instead")
+inline
+typename arma_scalar_only<eT>::result
+pow(const eT& A, const eT exponent)
+  {
+  arma_debug_sigprint();
+  
+  return eop_aux::pow(A, exponent);
+  }
+
+
+
 template<typename T1>
 arma_warn_unused
 arma_inline
@@ -797,6 +825,20 @@ pow(const T1& A, const typename T1::elem_type::value_type exponent)
 
 
 
+// workaround for old user code
+template<typename eT>
+arma_frown("use std::pow(arma::as_scalar(X),Y) instead")
+inline
+typename enable_if2< is_cx<eT>::yes, eT >::result
+pow(const eT& A, const typename eT::value_type exponent)
+  {
+  arma_debug_sigprint();
+  
+  return eop_aux::pow(A, eT(exponent));
+  }
+
+
+
 template<typename T1>
 arma_warn_unused
 arma_inline