From b37ce1c165e5c739ac35b676b85cfe51f83937fe Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Wed, 3 Feb 2016 12:01:59 +1100 Subject: [PATCH] n/lerp: fully qualify truncate functor lerp::truncate potentially conflicts with ::truncate from POSIX --- noise/lerp.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/noise/lerp.cpp b/noise/lerp.cpp index 2b81f12f..d549b54a 100644 --- a/noise/lerp.cpp +++ b/noise/lerp.cpp @@ -25,13 +25,12 @@ using util::lerp::linear; using util::lerp::cosine; using util::lerp::cubic; using util::lerp::quintic; -using util::lerp::truncate; //----------------------------------------------------------------------------- template T -truncate::operator() (T a, T, T weight) noexcept +util::lerp::truncate::operator() (T a, T, T weight) noexcept { static_assert (std::is_floating_point::value, "lerp is only defined for floating types");