diff options
| author | Max Kellermann <max@duempel.org> | 2013-12-22 18:52:54 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-12-22 21:32:25 +0100 |
| commit | b43ec3d6f08ab6b3044a2514f9bb8a8f1a0eb31f (patch) | |
| tree | 790eef4806cb4839fef9cf18362ef0b08b1819ae /src/pcm/PcmUtils.hxx | |
| parent | 316a25dead0698be5e5befb236e08146740aca77 (diff) | |
| download | mpd-b43ec3d6f08ab6b3044a2514f9bb8a8f1a0eb31f.tar.gz mpd-b43ec3d6f08ab6b3044a2514f9bb8a8f1a0eb31f.tar.xz mpd-b43ec3d6f08ab6b3044a2514f9bb8a8f1a0eb31f.zip | |
pcm/Traits: add MIN and MAX
Move from PcmClamp().
Diffstat (limited to 'src/pcm/PcmUtils.hxx')
| -rw-r--r-- | src/pcm/PcmUtils.hxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/pcm/PcmUtils.hxx b/src/pcm/PcmUtils.hxx index 06b3acb4d..0ca5dd4ac 100644 --- a/src/pcm/PcmUtils.hxx +++ b/src/pcm/PcmUtils.hxx @@ -51,19 +51,16 @@ static inline typename Traits::value_type PcmClamp(typename Traits::long_type x) { typedef typename Traits::value_type T; - typedef typename Traits::long_type U; - constexpr U MIN_VALUE = -(U(1) << (Traits::BITS - 1)); - constexpr U MAX_VALUE = (U(1) << (Traits::BITS - 1)) - 1; typedef std::numeric_limits<T> limits; - static_assert(MIN_VALUE >= limits::min(), "out of range"); - static_assert(MAX_VALUE <= limits::max(), "out of range"); + static_assert(Traits::MIN >= limits::min(), "out of range"); + static_assert(Traits::MAX <= limits::max(), "out of range"); - if (gcc_unlikely(x < MIN_VALUE)) - return T(MIN_VALUE); + if (gcc_unlikely(x < Traits::MIN)) + return T(Traits::MIN); - if (gcc_unlikely(x > MAX_VALUE)) - return T(MAX_VALUE); + if (gcc_unlikely(x > Traits::MAX)) + return T(Traits::MAX); return T(x); } |