diff --git a/include/armadillo_bits/Cube_meat.hpp b/include/armadillo_bits/Cube_meat.hpp index d25df130..b0cb9320 100644 --- a/include/armadillo_bits/Cube_meat.hpp +++ b/include/armadillo_bits/Cube_meat.hpp @@ -294,7 +294,7 @@ Cube::init_warm(const uword in_n_rows, const uword in_n_cols, const uword in return; } - arma_debug_check_bounds( (t_mem_state == 2), "Cube::init(): mismatch between size of auxiliary memory and requested size" ); + arma_debug_check( (t_mem_state == 2), "Cube::init(): mismatch between size of auxiliary memory and requested size" ); delete_mat(); diff --git a/include/armadillo_bits/Mat_meat.hpp b/include/armadillo_bits/Mat_meat.hpp index 1ebc6b5a..d4afc6a7 100644 --- a/include/armadillo_bits/Mat_meat.hpp +++ b/include/armadillo_bits/Mat_meat.hpp @@ -293,7 +293,7 @@ Mat::init_warm(uword in_n_rows, uword in_n_cols) return; } - arma_debug_check_bounds( (t_mem_state == 2), "Mat::init(): mismatch between size of auxiliary memory and requested size" ); + arma_debug_check( (t_mem_state == 2), "Mat::init(): mismatch between size of auxiliary memory and requested size" ); if(new_n_elem <= arma_config::mat_prealloc) { @@ -847,7 +847,7 @@ Mat::init(const std::initializer_list< std::initializer_list >& list) if(t.mem_state == 3) { - arma_debug_check_bounds( ((x_n_rows != t.n_rows) || (x_n_cols != t.n_cols)), "Mat::init(): size mismatch between fixed size matrix and initialiser list" ); + arma_debug_check( ((x_n_rows != t.n_rows) || (x_n_cols != t.n_cols)), "Mat::init(): size mismatch between fixed size matrix and initialiser list" ); } else { @@ -9103,7 +9103,7 @@ Mat::fixed::operator=(const std::initializer_lis const uword N = uword(list.size()); - arma_debug_check_bounds( (N > fixed_n_elem), "Mat::fixed: initialiser list is too long" ); + arma_debug_check( (N > fixed_n_elem), "Mat::fixed: initialiser list is too long" ); eT* this_mem = (*this).memptr(); diff --git a/include/armadillo_bits/fn_spsolve.hpp b/include/armadillo_bits/fn_spsolve.hpp index a512af95..3a4b7443 100644 --- a/include/armadillo_bits/fn_spsolve.hpp +++ b/include/armadillo_bits/fn_spsolve.hpp @@ -54,7 +54,7 @@ spsolve_helper const superlu_opts& opts = (settings.id == 1) ? static_cast(settings) : superlu_opts_default; - arma_debug_check_bounds( ( (opts.pivot_thresh < double(0)) || (opts.pivot_thresh > double(1)) ), "spsolve(): pivot_thresh out of bounds" ); + arma_debug_check( ( (opts.pivot_thresh < double(0)) || (opts.pivot_thresh > double(1)) ), "spsolve(): pivot_thresh must be in the [0,1] interval" ); if(sig == 's') // SuperLU solver {