From e712b832e8b90deacbb663e81038d435af97bc84 Mon Sep 17 00:00:00 2001 From: conrad Date: Thu, 11 Dec 2025 15:14:55 +1000 Subject: [PATCH] simplification --- include/armadillo_bits/Mat_meat.hpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/include/armadillo_bits/Mat_meat.hpp b/include/armadillo_bits/Mat_meat.hpp index 12a828f8..850b0b9e 100644 --- a/include/armadillo_bits/Mat_meat.hpp +++ b/include/armadillo_bits/Mat_meat.hpp @@ -312,15 +312,10 @@ Mat::init_cold() const char* error_message = "Mat::init(): requested size is too large; suggest to enable ARMA_64BIT_WORD"; #endif - arma_conform_check - ( - ( - ( (n_rows > ARMA_MAX_UHWORD) || (n_cols > ARMA_MAX_UHWORD) ) - ? ( (double(n_rows) * double(n_cols)) > double(ARMA_MAX_UWORD) ) - : false - ), - error_message - ); + if( (n_rows > ARMA_MAX_UHWORD) || (n_cols > ARMA_MAX_UHWORD) ) + { + arma_conform_check( ( (double(n_rows) * double(n_cols)) > double(ARMA_MAX_UWORD) ), error_message ); + } if(n_elem <= arma_config::mat_prealloc) {