diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/ogl_renderer/c++/common.hpp | 1 | ||||
| -rw-r--r-- | util/ogl_renderer/c++/lbm_ogl_renderer.cpp | 5 | ||||
| -rw-r--r-- | util/ogl_renderer/c++/state.hpp | 7 |
3 files changed, 5 insertions, 8 deletions
diff --git a/util/ogl_renderer/c++/common.hpp b/util/ogl_renderer/c++/common.hpp index 8f425e9..d621564 100644 --- a/util/ogl_renderer/c++/common.hpp +++ b/util/ogl_renderer/c++/common.hpp @@ -7,7 +7,6 @@ namespace kel { namespace lbm { namespace sch { -using namespace saw::schema; } } } diff --git a/util/ogl_renderer/c++/lbm_ogl_renderer.cpp b/util/ogl_renderer/c++/lbm_ogl_renderer.cpp index b8b687d..8c21a72 100644 --- a/util/ogl_renderer/c++/lbm_ogl_renderer.cpp +++ b/util/ogl_renderer/c++/lbm_ogl_renderer.cpp @@ -5,12 +5,11 @@ namespace kel { namespace lbm { namespace sch { -using namespace saw::schema; } } -saw::error_or<void> lbm_main(int argc, char** argv){ +kel::lbm::error_or<void> lbm_main(int argc, char** argv){ auto eo_state = lbm::create_ogl_renderer(); if(eo_state.is_error()){ return std::move(eo_state.get_error()); @@ -40,7 +39,7 @@ saw::error_or<void> lbm_main(int argc, char** argv){ } } - return saw::make_void(); + return kel::lbm::make_void(); } } diff --git a/util/ogl_renderer/c++/state.hpp b/util/ogl_renderer/c++/state.hpp index c429195..6a996de 100644 --- a/util/ogl_renderer/c++/state.hpp +++ b/util/ogl_renderer/c++/state.hpp @@ -8,7 +8,6 @@ namespace kel { namespace lbm { namespace sch { -using namespace saw::schema; } struct ogl_state final { @@ -55,8 +54,8 @@ public: } }; -saw::error_or<saw::own<ogl_state>> create_ogl_renderer(){ - auto owned_state = saw::heap<ogl_state>(); +kel::lbm::error_or<kel::lbm::own<ogl_state>> create_ogl_renderer(){ + auto owned_state = kel::lbm::heap<ogl_state>(); auto& st = *owned_state; @@ -67,7 +66,7 @@ saw::error_or<saw::own<ogl_state>> create_ogl_renderer(){ st.window = SDL_CreateWindow("Kel'LBM Renderer",st.w,st.h,SDL_WINDOW_OPENGL /*| SDL_WINDOW_HIDDEN*/); if(not st.window){ - return saw::make_error<saw::err::critical>("Window not created"); + return kel::lbm::make_error<kel::lbm::err::critical>("Window not created"); } st.context = SDL_GL_CreateContext(st.window); |
