From 07924aa0d551b39cd31abf88fb9c29fbcdcc12df Mon Sep 17 00:00:00 2001 From: lisyarus Date: Mon, 18 Jan 2021 20:02:35 +0300 Subject: [PATCH] Various clang compilation issues --- examples/animation_2d.cpp | 2 +- examples/physics_2d.cpp | 6 +++--- libs/geom/include/psemek/geom/box.hpp | 2 +- libs/gfx/source/effect/blur.cpp | 1 + libs/util/include/psemek/util/memory_stream.hpp | 7 +++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/animation_2d.cpp b/examples/animation_2d.cpp index 36ec2499..e5eb9355 100644 --- a/examples/animation_2d.cpp +++ b/examples/animation_2d.cpp @@ -429,7 +429,7 @@ struct controller // static constexpr std::size_t layer2 = 4; // static constexpr std::size_t layer3 = outputs; - static constexpr std::size_t param_count = (inputs + 1) * outputs; + //static constexpr std::size_t param_count = (inputs + 1) * outputs; static constexpr float max_output = 20.f; diff --git a/examples/physics_2d.cpp b/examples/physics_2d.cpp index 9826f2d0..dddcbac8 100644 --- a/examples/physics_2d.cpp +++ b/examples/physics_2d.cpp @@ -183,15 +183,15 @@ struct physics_2d_app (void)task; // task(); -// loop.dispatch_at(std::chrono::system_clock::now() + std::chrono::seconds{1}, [this]{ +// loop.dispatch_at(async::executor::clock::now() + std::chrono::seconds{1}, [this]{ // physics.add_object(ball_group, ball_shape, material, {simulation_box.corner(0.5f, 0.9f), 0.f}, {}); // }); - loop.dispatch_at(std::chrono::system_clock::now() + std::chrono::seconds{1}, [this]{ + loop.dispatch_at(async::executor::clock::now() + std::chrono::seconds{1}, [this]{ physics.explode(simulation_box.corner(0.5f, -0.2f), 1000.f, 100.f); }); -// loop.dispatch_at(std::chrono::system_clock::now() + std::chrono::seconds{5}, [this]{ +// loop.dispatch_at(async::executor::clock::now() + std::chrono::seconds{5}, [this]{ // stop(); // }); } diff --git a/libs/geom/include/psemek/geom/box.hpp b/libs/geom/include/psemek/geom/box.hpp index 361e0595..fb8149c0 100644 --- a/libs/geom/include/psemek/geom/box.hpp +++ b/libs/geom/include/psemek/geom/box.hpp @@ -80,7 +80,7 @@ namespace psemek::geom { static_assert(sizeof...(Ts) == N); - T w[N] = {ts...}; + T w[N] = {static_cast(ts)...}; point_type res; for (std::size_t i = 0; i < N; ++i) res[i] = lerp(axes[i], w[i]); diff --git a/libs/gfx/source/effect/blur.cpp b/libs/gfx/source/effect/blur.cpp index e1b067b3..729f3d32 100644 --- a/libs/gfx/source/effect/blur.cpp +++ b/libs/gfx/source/effect/blur.cpp @@ -6,6 +6,7 @@ #include #include +#include namespace psemek::gfx { diff --git a/libs/util/include/psemek/util/memory_stream.hpp b/libs/util/include/psemek/util/memory_stream.hpp index 03f05385..1509f02a 100644 --- a/libs/util/include/psemek/util/memory_stream.hpp +++ b/libs/util/include/psemek/util/memory_stream.hpp @@ -9,10 +9,9 @@ namespace psemek::util : std::istream { memory_istream(std::string_view data) - : b_(data) - { - rdbuf(&b_); - } + : std::istream(&b_) + , b_(data) + {} private: struct buf