diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-13 19:55:59 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-14 09:00:55 +0200 |
| commit | 54d5a27c7d89688afe09a7e383001586ac742846 (patch) | |
| tree | 25120b15bd170c0fc7712b20d1c1e9a4ea42492f /options/slider.cpp | |
| parent | 68f5f213bf0cbd0bd60a6849bf4379113ea06282 (diff) | |
options/slider: remove constexpr
it implies inline
Diffstat (limited to 'options/slider.cpp')
| -rw-r--r-- | options/slider.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/options/slider.cpp b/options/slider.cpp index 5789e951..aea3c48a 100644 --- a/options/slider.cpp +++ b/options/slider.cpp @@ -11,7 +11,7 @@ namespace options { -constexpr slider_value::slider_value(double cur, double min, double max) : +slider_value::slider_value(double cur, double min, double max) : cur_(cur), min_(min), max_(max) @@ -24,31 +24,25 @@ constexpr slider_value::slider_value(double cur, double min, double max) : cur_ = min_; } -template<typename t> -static constexpr auto abs_(t x) -{ - return x < t{0} ? -x : x; -} - -constexpr bool slider_value::operator==(const slider_value& v) const +bool slider_value::operator==(const slider_value& v) const { constexpr double eps = 2e-3; #if 1 - return (abs_(v.cur_ - cur_) < eps && - abs_(v.min_ - min_) < eps && - abs_(v.max_ - max_) < eps); + return (std::fabs(v.cur_ - cur_) < eps && + std::fabs(v.min_ - min_) < eps && + std::fabs(v.max_ - max_) < eps); #else - return (abs_(v.cur_ - cur_) < eps); + return (std::fabs(v.cur_ - cur_) < eps); #endif } -constexpr bool slider_value::operator!=(const slider_value& v) const +bool slider_value::operator!=(const slider_value& v) const { return !(*this == v); } -constexpr slider_value slider_value::update_from_slider(int pos, int q_min, int q_max) const +slider_value slider_value::update_from_slider(int pos, int q_min, int q_max) const { slider_value v(*this); |