From 0d7d77f1fd65d4ec523add231fc52089b00b0778 Mon Sep 17 00:00:00 2001 From: Ludovic 'Archivist' Lagouardette Date: Wed, 9 Sep 2020 23:46:38 +0200 Subject: [PATCH] Some more math fixes and dependency fixes --- include/gp/allocator/buddy.hpp | 2 +- include/gp/math/fp_math.hpp | 2 +- include/gp/math/integer_math.hpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/gp/allocator/buddy.hpp b/include/gp/allocator/buddy.hpp index a9799c8..8726bc4 100644 --- a/include/gp/allocator/buddy.hpp +++ b/include/gp/allocator/buddy.hpp @@ -2,7 +2,7 @@ #include "gp_config.hpp" #include "gp/buffer.hpp" #include "gp/array.hpp" -#include "gp/math.hpp" +#include "gp/math/integer_math.hpp" #include #include #include diff --git a/include/gp/math/fp_math.hpp b/include/gp/math/fp_math.hpp index 7417920..6d10a1d 100644 --- a/include/gp/math/fp_math.hpp +++ b/include/gp/math/fp_math.hpp @@ -13,7 +13,7 @@ namespace gp{ constexpr float pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062; template<> - constexpr double pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062; + constexpr double pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062L; template T abs(T); diff --git a/include/gp/math/integer_math.hpp b/include/gp/math/integer_math.hpp index 6691f46..40d3a29 100644 --- a/include/gp/math/integer_math.hpp +++ b/include/gp/math/integer_math.hpp @@ -70,7 +70,7 @@ namespace gp { return l + (((1 << l) ^ v) != 0); } - static_assert(msb(7) == 3, "bad log2"); - static_assert(msb(8) == 3, "bad log2"); + static_assert(msb(7) == 3, "bad msb"); + static_assert(msb(8) == 3, "bad msb"); } }