Sync with Armadillo 14.4.0

RcppCore · Feb 17, 2025 · 5db4dcb · 5db4dcb
1 parent 0d7537e
commit 5db4dcb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 31 deletions.
diff --git a/inst/include/armadillo_bits/arma_version.hpp b/inst/include/armadillo_bits/arma_version.hpp
@@ -22,9 +22,9 @@
 
 
 #define ARMA_VERSION_MAJOR 14
-#define ARMA_VERSION_MINOR 3
-#define ARMA_VERSION_PATCH 92
-#define ARMA_VERSION_NAME  "14.4-RC2"
+#define ARMA_VERSION_MINOR 4
+#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_NAME  "Filtered Espresso"
 
 
 

diff --git a/inst/include/armadillo_bits/fn_elem.hpp b/inst/include/armadillo_bits/fn_elem.hpp
@@ -767,20 +767,6 @@ 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
@@ -811,20 +797,6 @@ 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