Skip to content

Commit 5db4dcb

Browse files
committed
Sync with Armadillo 14.4.0
1 parent 0d7537e commit 5db4dcb

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

inst/include/armadillo_bits/arma_version.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323

2424
#define ARMA_VERSION_MAJOR 14
25-
#define ARMA_VERSION_MINOR 3
26-
#define ARMA_VERSION_PATCH 92
27-
#define ARMA_VERSION_NAME "14.4-RC2"
25+
#define ARMA_VERSION_MINOR 4
26+
#define ARMA_VERSION_PATCH 0
27+
#define ARMA_VERSION_NAME "Filtered Espresso"
2828

2929

3030

inst/include/armadillo_bits/fn_elem.hpp

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -767,20 +767,6 @@ pow(const T1& A, const typename T1::elem_type exponent)
767767

768768

769769

770-
// // workaround for old user code
771-
// template<typename eT>
772-
// arma_frown("use std::pow(arma::as_scalar(X),Y) instead")
773-
// inline
774-
// typename arma_scalar_only<eT>::result
775-
// pow(const eT& A, const eT exponent)
776-
// {
777-
// arma_debug_sigprint();
778-
//
779-
// return eop_aux::pow(A, exponent);
780-
// }
781-
782-
783-
784770
template<typename T1>
785771
arma_warn_unused
786772
arma_inline
@@ -811,20 +797,6 @@ pow(const T1& A, const typename T1::elem_type::value_type exponent)
811797

812798

813799

814-
// // workaround for old user code
815-
// template<typename eT>
816-
// arma_frown("use std::pow(arma::as_scalar(X),Y) instead")
817-
// inline
818-
// typename enable_if2< is_cx<eT>::yes, eT >::result
819-
// pow(const eT& A, const typename eT::value_type exponent)
820-
// {
821-
// arma_debug_sigprint();
822-
//
823-
// return eop_aux::pow(A, eT(exponent));
824-
// }
825-
826-
827-
828800
template<typename T1>
829801
arma_warn_unused
830802
arma_inline

0 commit comments

Comments
 (0)