olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix extraneous maybe_unused's 

Fix qmat::row
This commit is contained in:
Jonathan 2021-10-23 09:34:33 -04:00
parent 74253fd189
commit c607c0d98f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/qvec.hh
View File

@ -754,7 +754,7 @@ public:
}
// access row
[[nodiscard]] constexpr qvec<T, NCol> row(size_t row) const
[[nodiscard]] inline qvec<T, NCol> row(size_t row) const
{
assert(row >= 0 && row < NRow);
qvec<T, NCol> v;
@ -764,7 +764,7 @@ public:
return v;
}
void set_row(size_t row, const qvec<T, NCol> &values)
inline void set_row(size_t row, const qvec<T, NCol> &values)
{
for (size_t i = 0; i < NCol; i++) {
at(row, i) = values[i];
@ -777,7 +777,7 @@ public:
return reinterpret_cast<const qvec<T, NRow> &>(m_values[col * NRow]);
}
void set_col(size_t col, const qvec<T, NRow> &values) const
inline void set_col(size_t col, const qvec<T, NRow> &values) const
{
reinterpret_cast<qvec<T, NRow> &>(m_values[col * NRow]) = values;
}

12
include/light/settings.hh
View File

@ -124,7 +124,7 @@ public:
class lockable_bool_t : public lockable_setting_t
{
private:
[[maybe_unused]] bool _default, _value;
bool _value;
void setBoolValueInternal(bool f, setting_source_t newsource)
{
@ -153,7 +153,7 @@ public:
virtual std::string stringValue() const { return _value ? "1" : "0"; }
lockable_bool_t(std::vector<std::string> names, bool v) : lockable_setting_t(names), _default(v), _value(v) { }
lockable_bool_t(std::vector<std::string> names, bool v) : lockable_setting_t(names), _value(v) { }
lockable_bool_t(std::string name, bool v) : lockable_bool_t(std::vector<std::string>{name}, v) { }
};
@ -161,7 +161,7 @@ public:
class lockable_vec_t : public lockable_setting_t
{
private:
[[maybe_unused]] vec_t _default, _value, _min, _max;
vec_t _value, _min, _max;
inline void setFloatInternal(vec_t f, setting_source_t newsource)
{
@ -212,7 +212,7 @@ public:
lockable_vec_t(std::vector<std::string> names, vec_t v, vec_t minval = -std::numeric_limits<vec_t>::infinity(),
vec_t maxval = std::numeric_limits<vec_t>::infinity())
: lockable_setting_t(names), _default(v), _value(v), _min(minval), _max(maxval)
: lockable_setting_t(names), _value(v), _min(minval), _max(maxval)
{
// check the default value is valid
Q_assert(_min < _max);
@ -230,7 +230,7 @@ public:
class lockable_string_t : public lockable_setting_t
{
private:
std::string _default, _value;
std::string _value;
public:
virtual void setStringValue(const std::string &str, bool locked = false)
@ -242,7 +242,7 @@ public:
virtual std::string stringValue() const { return _value; }
lockable_string_t(std::vector<std::string> names, std::string v) : lockable_setting_t(names), _default(v), _value(v)
lockable_string_t(std::vector<std::string> names, std::string v) : lockable_setting_t(names), _value(v)
{
}