diff --git a/src/osp/tasks/builder.h b/src/osp/tasks/builder.h index 503d4a08..3bd2a794 100644 --- a/src/osp/tasks/builder.h +++ b/src/osp/tasks/builder.h @@ -30,6 +30,7 @@ #include #include +#include #include #include #include diff --git a/src/osp/tasks/tasks.h b/src/osp/tasks/tasks.h index 76320d88..b7c1089d 100644 --- a/src/osp/tasks/tasks.h +++ b/src/osp/tasks/tasks.h @@ -41,8 +41,8 @@ #define OSP_DECLARE_STAGE_NAMES(type, ...) \ inline osp::ArrayView stage_names([[maybe_unused]] type _) noexcept \ { \ - static auto const arr = std::array{__VA_ARGS__}; \ - return osp::arrayView( arr.data(), arr.size() ); \ + static auto const arr = std::initializer_list{__VA_ARGS__}; \ + return osp::arrayView(arr); \ } #define OSP_DECLARE_STAGE_SCHEDULE(type, schedule_enum) \ diff --git a/src/osp/tasks/top_execute.cpp b/src/osp/tasks/top_execute.cpp index 512b2bd6..7ed81b23 100644 --- a/src/osp/tasks/top_execute.cpp +++ b/src/osp/tasks/top_execute.cpp @@ -32,7 +32,6 @@ #include #include -#include #include #include @@ -110,8 +109,6 @@ std::ostream& operator<<(std::ostream& rStream, TopExecWriteState const& write) { ExecPipeline const &plExec = exec.plData[pipeline]; - std::cout << "pipeline: " << int(pipeline) << "\n"; - for (int i = 0; i < depth; ++i) { rStream << "- "; @@ -164,7 +161,6 @@ std::ostream& operator<<(std::ostream& rStream, TopExecWriteState const& write) { rStream << ' '; } - std::cout << "AAAA" << info.name; rStream << " | " << (info.name.empty() ? "untitled or deleted" : info.name); diff --git a/src/test_application/MagnumApplication.h b/src/test_application/MagnumApplication.h index dc60483a..05adeb4e 100644 --- a/src/test_application/MagnumApplication.h +++ b/src/test_application/MagnumApplication.h @@ -56,15 +56,10 @@ class IOspApplication * * This is intended to run a flight scene, map view, vehicle editor, or menu. */ -class MagnumApplication : Magnum::Platform::Application +class MagnumApplication : public Magnum::Platform::Application { - public: - using Magnum::Platform::Application::KeyEvent; - using Magnum::Platform::Application::MouseEvent; - using Magnum::Platform::Application::Arguments; - using AppPtr_t = std::unique_ptr; explicit MagnumApplication(