From 91b672bd1af2fe004d4bb893e6770b893ffefc1f Mon Sep 17 00:00:00 2001 From: conrad Date: Sat, 18 Oct 2025 12:02:52 +1000 Subject: [PATCH] rename variable for clarity --- include/armadillo_bits/Mat_bones.hpp | 2 +- include/armadillo_bits/Mat_meat.hpp | 8 ++++---- include/armadillo_bits/Row_bones.hpp | 2 +- include/armadillo_bits/Row_meat.hpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/armadillo_bits/Mat_bones.hpp b/include/armadillo_bits/Mat_bones.hpp index a0e71c9f..9eff0286 100644 --- a/include/armadillo_bits/Mat_bones.hpp +++ b/include/armadillo_bits/Mat_bones.hpp @@ -120,7 +120,7 @@ class Mat : public Base< eT, Mat > template inline explicit Mat(const Base& A, const Base& B, const arma_vec_indicator&, const uhword in_vec_state); template inline explicit Mat(const Base& A, const Base& B); - inline explicit Mat(const subview& X, const bool use_colmem); // only to be used by the quasi_unwrap class + inline explicit Mat(const subview& X, const bool use_direct_mem); // only to be used by the quasi_unwrap class inline Mat(const subview& X, const arma_vec_indicator&, const uhword in_vec_state); inline Mat(const subview& X); diff --git a/include/armadillo_bits/Mat_meat.hpp b/include/armadillo_bits/Mat_meat.hpp index 354eaf70..21c46443 100644 --- a/include/armadillo_bits/Mat_meat.hpp +++ b/include/armadillo_bits/Mat_meat.hpp @@ -2021,18 +2021,18 @@ Mat::Mat(const Base::pod_type,T1>& A, const Base inline -Mat::Mat(const subview& X, const bool use_colmem) +Mat::Mat(const subview& X, const bool use_direct_mem) : n_rows(X.n_rows) , n_cols(X.n_cols) , n_elem(X.n_elem) , n_alloc(0) , vec_state(0) - , mem_state(use_colmem ? 3 : 0) - , mem (use_colmem ? X.colptr(0) : nullptr) + , mem_state(use_direct_mem ? 3 : 0 ) + , mem (use_direct_mem ? X.colptr(0) : nullptr) { arma_debug_sigprint_this(this); - if(use_colmem) + if(use_direct_mem) { arma_debug_print("Mat::Mat(): using existing memory in a submatrix"); } diff --git a/include/armadillo_bits/Row_bones.hpp b/include/armadillo_bits/Row_bones.hpp index 908e196c..0cbcf920 100644 --- a/include/armadillo_bits/Row_bones.hpp +++ b/include/armadillo_bits/Row_bones.hpp @@ -85,7 +85,7 @@ class Row : public Mat template inline explicit Row(const Base& A, const Base& B); - inline explicit Row(const subview& X, const bool use_colmem); // only to be used by the quasi_unwrap class + inline explicit Row(const subview& X, const bool use_direct_mem); // only to be used by the quasi_unwrap class template inline Row(const BaseCube& X); template inline Row& operator=(const BaseCube& X); diff --git a/include/armadillo_bits/Row_meat.hpp b/include/armadillo_bits/Row_meat.hpp index 012d85ef..3ec1d018 100644 --- a/include/armadillo_bits/Row_meat.hpp +++ b/include/armadillo_bits/Row_meat.hpp @@ -612,8 +612,8 @@ Row::Row template inline -Row::Row(const subview& X, const bool use_colmem) - : Mat(X, use_colmem) +Row::Row(const subview& X, const bool use_direct_mem) + : Mat(X, use_direct_mem) { arma_debug_sigprint(); }