From 42f38ce3ca4569bb50dabe1c2739dbcd2cf68115 Mon Sep 17 00:00:00 2001 From: conrad Date: Fri, 3 Feb 2023 15:04:30 +1000 Subject: [PATCH] mark quiet_load() and quiet_save() as deprecated --- include/armadillo_bits/SpMat_bones.hpp | 12 ++++++------ include/armadillo_bits/SpMat_meat.hpp | 12 ++++-------- include/armadillo_bits/field_bones.hpp | 8 ++++---- include/armadillo_bits/field_meat.hpp | 8 ++++---- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/include/armadillo_bits/SpMat_bones.hpp b/include/armadillo_bits/SpMat_bones.hpp index 4b24c844..3867bbde 100644 --- a/include/armadillo_bits/SpMat_bones.hpp +++ b/include/armadillo_bits/SpMat_bones.hpp @@ -398,13 +398,13 @@ class SpMat : public SpBase< eT, SpMat > inline arma_cold bool load(const csv_name& spec, const file_type type = csv_ascii); inline arma_cold bool load( std::istream& is, const file_type type = arma_binary); - inline arma_cold bool quiet_save(const std::string name, const file_type type = arma_binary) const; - inline arma_cold bool quiet_save(const csv_name& spec, const file_type type = csv_ascii) const; - inline arma_cold bool quiet_save( std::ostream& os, const file_type type = arma_binary) const; + arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const; + arma_deprecated inline bool quiet_save(const csv_name& spec, const file_type type = csv_ascii) const; + arma_deprecated inline bool quiet_save( std::ostream& os, const file_type type = arma_binary) const; - inline arma_cold bool quiet_load(const std::string name, const file_type type = arma_binary); - inline arma_cold bool quiet_load(const csv_name& spec, const file_type type = csv_ascii); - inline arma_cold bool quiet_load( std::istream& is, const file_type type = arma_binary); + arma_deprecated inline bool quiet_load(const std::string name, const file_type type = arma_binary); + arma_deprecated inline bool quiet_load(const csv_name& spec, const file_type type = csv_ascii); + arma_deprecated inline bool quiet_load( std::istream& is, const file_type type = arma_binary); diff --git a/include/armadillo_bits/SpMat_meat.hpp b/include/armadillo_bits/SpMat_meat.hpp index 2bb4d98e..c1090914 100644 --- a/include/armadillo_bits/SpMat_meat.hpp +++ b/include/armadillo_bits/SpMat_meat.hpp @@ -4985,10 +4985,9 @@ SpMat::load(std::istream& is, const file_type type) -//! save the matrix to a file, without printing any error messages template +arma_deprecated inline -arma_cold bool SpMat::quiet_save(const std::string name, const file_type type) const { @@ -4999,10 +4998,9 @@ SpMat::quiet_save(const std::string name, const file_type type) const -//! save the matrix to a stream, without printing any error messages template +arma_deprecated inline -arma_cold bool SpMat::quiet_save(std::ostream& os, const file_type type) const { @@ -5013,10 +5011,9 @@ SpMat::quiet_save(std::ostream& os, const file_type type) const -//! load a matrix from a file, without printing any error messages template +arma_deprecated inline -arma_cold bool SpMat::quiet_load(const std::string name, const file_type type) { @@ -5027,10 +5024,9 @@ SpMat::quiet_load(const std::string name, const file_type type) -//! load a matrix from a stream, without printing any error messages template +arma_deprecated inline -arma_cold bool SpMat::quiet_load(std::istream& is, const file_type type) { diff --git a/include/armadillo_bits/field_bones.hpp b/include/armadillo_bits/field_bones.hpp index 303cac4a..3685baeb 100644 --- a/include/armadillo_bits/field_bones.hpp +++ b/include/armadillo_bits/field_bones.hpp @@ -217,11 +217,11 @@ class field inline arma_cold bool load( std::istream& is, const file_type type = auto_detect); - inline arma_cold bool quiet_save(const std::string name, const file_type type = arma_binary) const; - inline arma_cold bool quiet_save( std::ostream& os, const file_type type = arma_binary) const; + arma_deprecated inline bool quiet_save(const std::string name, const file_type type = arma_binary) const; + arma_deprecated inline bool quiet_save( std::ostream& os, const file_type type = arma_binary) const; - inline arma_cold bool quiet_load(const std::string name, const file_type type = auto_detect); - inline arma_cold bool quiet_load( std::istream& is, const file_type type = auto_detect); + arma_deprecated inline bool quiet_load(const std::string name, const file_type type = auto_detect); + arma_deprecated inline bool quiet_load( std::istream& is, const file_type type = auto_detect); // for container-like functionality diff --git a/include/armadillo_bits/field_meat.hpp b/include/armadillo_bits/field_meat.hpp index 6ab67999..fdfab822 100644 --- a/include/armadillo_bits/field_meat.hpp +++ b/include/armadillo_bits/field_meat.hpp @@ -1936,8 +1936,8 @@ field::load(std::istream& is, const file_type type) template +arma_deprecated inline -arma_cold bool field::quiet_save(const std::string name, const file_type type) const { @@ -1949,8 +1949,8 @@ field::quiet_save(const std::string name, const file_type type) const template +arma_deprecated inline -arma_cold bool field::quiet_save(std::ostream& os, const file_type type) const { @@ -1962,8 +1962,8 @@ field::quiet_save(std::ostream& os, const file_type type) const template +arma_deprecated inline -arma_cold bool field::quiet_load(const std::string name, const file_type type) { @@ -1975,8 +1975,8 @@ field::quiet_load(const std::string name, const file_type type) template +arma_deprecated inline -arma_cold bool field::quiet_load(std::istream& is, const file_type type) {