fixed linux

This commit is contained in:
fourtf
2018-06-11 19:11:33 +02:00
parent f2f34a4068
commit 3f9a48fd72
3 changed files with 7 additions and 10 deletions
+2 -8
View File
@@ -1,6 +1,6 @@
#pragma once
#include <algorithm>
#include <functional>
namespace chatterino {
namespace util {
@@ -10,13 +10,7 @@ namespace util {
template <class T>
constexpr const T &clamp(const T &v, const T &lo, const T &hi)
{
return clamp(v, lo, hi, std::less<>());
}
template <class T, class Compare>
constexpr const T &clamp(const T &v, const T &lo, const T &hi, Compare comp)
{
return assert(!comp(hi, lo)), comp(v, lo) ? lo : comp(hi, v) ? hi : v;
return assert(!(hi < lo)), (v < lo) ? lo : (hi < v) ? hi : v;
}
} // namespace util