From 8d350a1534dfc1cf0fb32fb02045f66697b04de3 Mon Sep 17 00:00:00 2001 From: conrad Date: Mon, 15 Jun 2026 11:52:45 +1000 Subject: [PATCH] remove unused code --- include/armadillo_bits/Col_bones.hpp | 3 -- include/armadillo_bits/Col_meat.hpp | 58 ---------------------------- include/armadillo_bits/Row_bones.hpp | 3 -- include/armadillo_bits/Row_meat.hpp | 58 ---------------------------- 4 files changed, 122 deletions(-) diff --git a/include/armadillo_bits/Col_bones.hpp b/include/armadillo_bits/Col_bones.hpp index 16a81d51..8adad5ca 100644 --- a/include/armadillo_bits/Col_bones.hpp +++ b/include/armadillo_bits/Col_bones.hpp @@ -69,9 +69,6 @@ class Col : public Mat inline Col(Col&& m); inline Col& operator=(Col&& m); - // inline Col(Mat&& m); - // inline Col& operator=(Mat&& m); - inline Col& operator=(const eT val); inline Col& operator=(const Col& m); diff --git a/include/armadillo_bits/Col_meat.hpp b/include/armadillo_bits/Col_meat.hpp index 5c1e1ccd..669a1b74 100644 --- a/include/armadillo_bits/Col_meat.hpp +++ b/include/armadillo_bits/Col_meat.hpp @@ -431,64 +431,6 @@ Col::operator=(Col&& X) -// template -// inline -// Col::Col(Mat&& X) -// : Mat(arma_vec_indicator(), 1) -// { -// arma_debug_sigprint(arma_str::format("this: %x; X: %x") % this % &X); -// -// if(X.n_cols != 1) { const Mat& XX = X; Mat::operator=(XX); return; } -// -// access::rw(Mat::n_rows) = X.n_rows; -// access::rw(Mat::n_cols) = 1; -// access::rw(Mat::n_elem) = X.n_elem; -// access::rw(Mat::n_alloc) = X.n_alloc; -// -// if( (X.n_alloc > arma_config::mat_prealloc) || (X.mem_state == 1) || (X.mem_state == 2) ) -// { -// access::rw(Mat::mem_state) = X.mem_state; -// access::rw(Mat::mem) = X.mem; -// -// access::rw(X.n_rows) = 0; -// access::rw(X.n_elem) = 0; -// access::rw(X.n_alloc) = 0; -// access::rw(X.mem_state) = 0; -// access::rw(X.mem) = nullptr; -// } -// else // condition: (X.n_alloc <= arma_config::mat_prealloc) || (X.mem_state == 0) || (X.mem_state == 3) -// { -// (*this).init_cold(); -// -// arrayops::copy( (*this).memptr(), X.mem, X.n_elem ); -// -// if( (X.mem_state == 0) && (X.n_alloc <= arma_config::mat_prealloc) ) -// { -// access::rw(X.n_rows) = 0; -// access::rw(X.n_elem) = 0; -// access::rw(X.mem) = nullptr; -// } -// } -// } -// -// -// -// template -// inline -// Col& -// Col::operator=(Mat&& X) -// { -// arma_debug_sigprint(arma_str::format("this: %x; X: %x") % this % &X); -// -// if(X.n_cols != 1) { const Mat& XX = X; Mat::operator=(XX); return *this; } -// -// (*this).steal_mem(X, true); -// -// return *this; -// } - - - template inline Col& diff --git a/include/armadillo_bits/Row_bones.hpp b/include/armadillo_bits/Row_bones.hpp index 0cbd58aa..3dfebea6 100644 --- a/include/armadillo_bits/Row_bones.hpp +++ b/include/armadillo_bits/Row_bones.hpp @@ -69,9 +69,6 @@ class Row : public Mat inline Row(Row&& m); inline Row& operator=(Row&& m); - // inline Row(Mat&& m); - // inline Row& operator=(Mat&& m); - inline Row& operator=(const eT val); inline Row& operator=(const Row& X); diff --git a/include/armadillo_bits/Row_meat.hpp b/include/armadillo_bits/Row_meat.hpp index 605b54ba..ac4a5c20 100644 --- a/include/armadillo_bits/Row_meat.hpp +++ b/include/armadillo_bits/Row_meat.hpp @@ -431,64 +431,6 @@ Row::operator=(Row&& X) -// template -// inline -// Row::Row(Mat&& X) -// : Mat(arma_vec_indicator(), 2) -// { -// arma_debug_sigprint(arma_str::format("this: %x; X: %x") % this % &X); -// -// if(X.n_rows != 1) { const Mat& XX = X; Mat::operator=(XX); return; } -// -// access::rw(Mat::n_rows) = 1; -// access::rw(Mat::n_cols) = X.n_cols; -// access::rw(Mat::n_elem) = X.n_elem; -// access::rw(Mat::n_alloc) = X.n_alloc; -// -// if( (X.n_alloc > arma_config::mat_prealloc) || (X.mem_state == 1) || (X.mem_state == 2) ) -// { -// access::rw(Mat::mem_state) = X.mem_state; -// access::rw(Mat::mem) = X.mem; -// -// access::rw(X.n_cols) = 0; -// access::rw(X.n_elem) = 0; -// access::rw(X.n_alloc) = 0; -// access::rw(X.mem_state) = 0; -// access::rw(X.mem) = nullptr; -// } -// else // condition: (X.n_alloc <= arma_config::mat_prealloc) || (X.mem_state == 0) || (X.mem_state == 3) -// { -// (*this).init_cold(); -// -// arrayops::copy( (*this).memptr(), X.mem, X.n_elem ); -// -// if( (X.mem_state == 0) && (X.n_alloc <= arma_config::mat_prealloc) ) -// { -// access::rw(X.n_cols) = 0; -// access::rw(X.n_elem) = 0; -// access::rw(X.mem) = nullptr; -// } -// } -// } -// -// -// -// template -// inline -// Row& -// Row::operator=(Mat&& X) -// { -// arma_debug_sigprint(arma_str::format("this: %x; X: %x") % this % &X); -// -// if(X.n_rows != 1) { const Mat& XX = X; Mat::operator=(XX); return *this; } -// -// (*this).steal_mem(X, true); -// -// return *this; -// } - - - template inline Row&