Fix windows build

TheOpenSpaceProgram · Aug 28, 2023 · 8a0960c · 8a0960c
1 parent 1025ae8
commit 8a0960c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/src/osp/tasks/builder.h b/src/osp/tasks/builder.h
@@ -30,6 +30,7 @@
 #include <iterator>
 #include <longeron/containers/bit_view.hpp>
 
+#include <array>
 #include <cassert>
 #include <cstdint>
 #include <vector>

diff --git 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<std::string_view const> stage_names([[maybe_unused]] type _) noexcept             \
     {                                                                                                       \
-        static auto const arr = std::array<std::string_view const, std::size({__VA_ARGS__})>{__VA_ARGS__};  \
-        return osp::arrayView( arr.data(), arr.size() );                                                    \
+        static auto const arr = std::initializer_list<std::string_view>{__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
@@ -32,7 +32,6 @@
 
 #include <algorithm>
 #include <iomanip>
-#include <iostream>
 #include <sstream>
 #include <vector>
 
@@ -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
@@ -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<IOspApplication>;
 
     explicit MagnumApplication(