Skip to content

Commit 242ee06

Browse files
committed
Armadillo 12.6.3
1 parent 11ce18a commit 242ee06

File tree

8 files changed

+129
-61
lines changed

8 files changed

+129
-61
lines changed

inst/include/armadillo_bits/SpSubview_bones.hpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,24 +104,24 @@ class SpSubview : public SpBase< eT, SpSubview<eT> >
104104
inline void randn();
105105

106106

107-
arma_hot inline SpSubview_MapMat_val<eT> operator[](const uword i);
108-
arma_hot inline eT operator[](const uword i) const;
107+
arma_warn_unused inline SpSubview_MapMat_val<eT> operator[](const uword i);
108+
arma_warn_unused inline eT operator[](const uword i) const;
109109

110-
arma_hot inline SpSubview_MapMat_val<eT> operator()(const uword i);
111-
arma_hot inline eT operator()(const uword i) const;
110+
arma_warn_unused inline SpSubview_MapMat_val<eT> operator()(const uword i);
111+
arma_warn_unused inline eT operator()(const uword i) const;
112112

113-
arma_hot inline SpSubview_MapMat_val<eT> operator()(const uword in_row, const uword in_col);
114-
arma_hot inline eT operator()(const uword in_row, const uword in_col) const;
113+
arma_warn_unused inline SpSubview_MapMat_val<eT> operator()(const uword in_row, const uword in_col);
114+
arma_warn_unused inline eT operator()(const uword in_row, const uword in_col) const;
115115

116-
arma_hot inline SpSubview_MapMat_val<eT> at(const uword i);
117-
arma_hot inline eT at(const uword i) const;
116+
arma_warn_unused inline SpSubview_MapMat_val<eT> at(const uword i);
117+
arma_warn_unused inline eT at(const uword i) const;
118118

119-
arma_hot inline SpSubview_MapMat_val<eT> at(const uword in_row, const uword in_col);
120-
arma_hot inline eT at(const uword in_row, const uword in_col) const;
119+
arma_warn_unused inline SpSubview_MapMat_val<eT> at(const uword in_row, const uword in_col);
120+
arma_warn_unused inline eT at(const uword in_row, const uword in_col) const;
121121

122122
inline bool check_overlap(const SpSubview& x) const;
123123

124-
inline bool is_vec() const;
124+
arma_warn_unused inline bool is_vec() const;
125125

126126
inline SpSubview_row<eT> row(const uword row_num);
127127
inline const SpSubview_row<eT> row(const uword row_num) const;

inst/include/armadillo_bits/arma_config.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,13 @@ struct arma_config
237237
#endif
238238

239239

240+
#if (!defined(ARMA_DONT_TREAT_TEXT_AS_BINARY))
241+
static constexpr bool text_as_binary = true;
242+
#else
243+
static constexpr bool text_as_binary = false;
244+
#endif
245+
246+
240247
static constexpr uword warn_level = (sword(ARMA_WARN_LEVEL) > 0) ? uword(ARMA_WARN_LEVEL) : 0;
241248
};
242249

inst/include/armadillo_bits/arma_version.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#define ARMA_VERSION_MAJOR 12
2525
#define ARMA_VERSION_MINOR 6
26-
#define ARMA_VERSION_PATCH 2
26+
#define ARMA_VERSION_PATCH 3
2727
#define ARMA_VERSION_NAME "Cortisol Retox"
2828

2929

inst/include/armadillo_bits/compiler_setup.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@
159159
#undef ARMA_GCC_VERSION
160160
#define ARMA_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
161161

162-
#if (ARMA_GCC_VERSION < 40800)
163-
#error "*** newer compiler required; need gcc 4.8 or later ***"
162+
#if (ARMA_GCC_VERSION < 40803)
163+
#error "*** newer compiler required; need gcc 4.8.3 or newer ***"
164164
#endif
165165

166166
// #if (ARMA_GCC_VERSION < 60100)
@@ -488,8 +488,7 @@
488488
#if defined(min) || defined(max)
489489
#undef min
490490
#undef max
491-
#pragma message ("WARNING: undefined conflicting 'min' and/or 'max' macros;")
492-
#pragma message ("WARNING: suggest to define NOMINMAX before including any windows header")
491+
#pragma message ("WARNING: undefined conflicting 'min' and/or 'max' macros")
493492
#endif
494493

495494
// https://sourceware.org/bugzilla/show_bug.cgi?id=19239

inst/include/armadillo_bits/diskio_bones.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ class diskio
5656

5757
arma_cold inline static bool is_readable(const std::string& name);
5858

59+
arma_cold inline static void sanitise_token(std::string& token);
60+
5961
template<typename eT> inline static bool convert_token(eT& val, const std::string& token);
6062
template<typename T> inline static bool convert_token(std::complex<T>& val, const std::string& token);
6163

0 commit comments

Comments
 (0)