Skip to content
Snippets Groups Projects
Commit adc65cd9 authored by Philip Trettner's avatar Philip Trettner
Browse files

fixed more std dependency

parent fd65436e
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,7 @@ public:
{
m_seed = u64(rd()) << 31 | u64(rd());
}
void seed(size_t seed) { m_seed = (seed ^ 0x2b41a160bab708aduLL) + size_t(seed == 0x2b41a160bab708aduLL); }
void seed(u64 seed) { m_seed = (seed ^ 0x2b41a160bab708aduLL) + u64(seed == 0x2b41a160bab708aduLL); }
result_type operator()()
{
......@@ -88,7 +88,7 @@ public:
{
m_seed = u64(rd()) << 31 | u64(rd());
}
void seed(size_t seed) { m_seed = (seed ^ 0x2b41a160bab708aduLL) + size_t(seed == 0x2b41a160bab708aduLL); }
void seed(u64 seed) { m_seed = (seed ^ 0x2b41a160bab708aduLL) + u64(seed == 0x2b41a160bab708aduLL); }
result_type operator()()
{
......
#pragma once
#include <cmath>
#include <cstdlib>
#include <type_traits>
#include "../../detail/traits.hh"
#include "../../types/scalar.hh"
......@@ -66,12 +64,12 @@ inline i64 iround(f64 v) { return v >= 0 ? i64(v + 0.5) : i64(v - 0.5); }
template <class T, class = enable_if<is_scalar<T>>>
constexpr T min(T const& a, T const& b)
{
return std::min(b, a);
return a < b ? a : b;
}
template <class T, class = enable_if<is_scalar<T>>>
constexpr T max(T const& a, T const& b)
{
return std::max(b, a);
return a < b ? b : a;
}
template <class T, class = enable_if<has_multiplication<T>>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment