King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

fix math functions

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-04-26 00:25:35 +09:00
parent dad3acceea
commit 2e2b6c96ab
30 changed files with 121 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sprout/math/fmax.hpp
View file

@ -1,10 +1,10 @@
#ifndef SPROUT_MATH_FMAX_HPP
#define SPROUT_MATH_FMAX_HPP
#include <limits>
#include <type_traits>
#include <sprout/config.hpp>
#include <sprout/math/detail/config.hpp>
#include <sprout/math/isnan.hpp>
#include <sprout/type_traits/float_promote.hpp>
#include <sprout/type_traits/enabler_if.hpp>
@ -17,9 +17,8 @@ namespace sprout {
>
inline SPROUT_CONSTEXPR FloatType
fmax(FloatType x, FloatType y) {
return x < y && !y == std::numeric_limits<FloatType>::quiet_NaN() ? y : x;
return x < y && !sprout::math::isnan(y) ? y : x;
}
template<
typename ArithmeticType1,
typename ArithmeticType2,