diff --git a/sources/enduro2d/core/render_impl/render_opengl.cpp b/sources/enduro2d/core/render_impl/render_opengl.cpp index 2c82087f..aeab0126 100644 --- a/sources/enduro2d/core/render_impl/render_opengl.cpp +++ b/sources/enduro2d/core/render_impl/render_opengl.cpp @@ -301,7 +301,7 @@ namespace { bind_property_block(debug, ps, pb); try { - stdex::invoke( + std::invoke( std::forward(f), std::forward(args)...); } catch (...) { @@ -326,7 +326,7 @@ namespace } } try { - stdex::invoke(std::forward(f), std::forward(args)...); + std::invoke(std::forward(f), std::forward(args)...); } catch (...) { for ( std::size_t i = 0, e = geo.vertices_count(); i < e; ++i ) { const vertex_buffer_ptr& vb = geo.vertices(i); diff --git a/sources/enduro2d/core/render_impl/render_opengl_base.hpp b/sources/enduro2d/core/render_impl/render_opengl_base.hpp index aaaf1b83..4055215c 100644 --- a/sources/enduro2d/core/render_impl/render_opengl_base.hpp +++ b/sources/enduro2d/core/render_impl/render_opengl_base.hpp @@ -391,7 +391,7 @@ namespace e2d::opengl GL_CHECK_CODE(debug, glUseProgram( program)); try { - stdex::invoke(std::forward(f), std::forward(args)...); + std::invoke(std::forward(f), std::forward(args)...); } catch (...) { GL_CHECK_CODE(debug, glUseProgram( math::numeric_cast(prev_program))); @@ -418,7 +418,7 @@ namespace e2d::opengl GL_CHECK_CODE(debug, glBindBuffer( target, buffer)); try { - stdex::invoke(std::forward(f), std::forward(args)...); + std::invoke(std::forward(f), std::forward(args)...); } catch (...) { GL_CHECK_CODE(debug, glBindBuffer( target, math::numeric_cast(prev_buffer))); @@ -445,7 +445,7 @@ namespace e2d::opengl GL_CHECK_CODE(debug, glBindTexture( target, texture)); try { - stdex::invoke(std::forward(f), std::forward(args)...); + std::invoke(std::forward(f), std::forward(args)...); } catch (...) { GL_CHECK_CODE(debug, glBindTexture( target, math::numeric_cast(prev_texture))); @@ -472,7 +472,7 @@ namespace e2d::opengl GL_CHECK_CODE(debug, glBindFramebuffer( target, framebuffer)); try { - stdex::invoke(std::forward(f), std::forward(args)...); + std::invoke(std::forward(f), std::forward(args)...); } catch (...) { GL_CHECK_CODE(debug, glBindFramebuffer( target, math::numeric_cast(prev_framebuffer))); @@ -499,7 +499,7 @@ namespace e2d::opengl GL_CHECK_CODE(debug, glBindRenderbuffer( target, renderbuffer)); try { - stdex::invoke(std::forward(f), std::forward(args)...); + std::invoke(std::forward(f), std::forward(args)...); } catch (...) { GL_CHECK_CODE(debug, glBindRenderbuffer( target, math::numeric_cast(prev_renderbuffer))); diff --git a/sources/enduro2d/core/render_impl/render_opengl_impl.hpp b/sources/enduro2d/core/render_impl/render_opengl_impl.hpp index 8889f5cf..2baf3d5f 100644 --- a/sources/enduro2d/core/render_impl/render_opengl_impl.hpp +++ b/sources/enduro2d/core/render_impl/render_opengl_impl.hpp @@ -43,7 +43,7 @@ namespace e2d void shader::internal_state::with_uniform_location(str_hash name, F&& f) const { const auto iter = uniforms_.find(name); if ( iter != uniforms_.end() ) { - stdex::invoke(std::forward(f), iter->second); + std::invoke(std::forward(f), iter->second); } } @@ -51,7 +51,7 @@ namespace e2d void shader::internal_state::with_attribute_location(str_hash name, F&& f) const { const auto iter = attributes_.find(name); if ( iter != attributes_.end() ) { - stdex::invoke(std::forward(f), iter->second); + std::invoke(std::forward(f), iter->second); } } @@ -178,10 +178,10 @@ namespace e2d public: internal_state& reset_states() noexcept; internal_state& set_states(const state_block& sb) noexcept; - + internal_state& reset_shader_program() noexcept; internal_state& set_shader_program(const shader_ptr& sp) noexcept; - + internal_state& reset_render_target() noexcept; internal_state& set_render_target(const render_target_ptr& rt) noexcept; private: diff --git a/sources/enduro2d/core/vfs.cpp b/sources/enduro2d/core/vfs.cpp index 30ade320..6fdeaded 100644 --- a/sources/enduro2d/core/vfs.cpp +++ b/sources/enduro2d/core/vfs.cpp @@ -98,7 +98,7 @@ namespace e2d const auto resolved_url = resolve_url(url); const auto scheme_iter = schemes.find(resolved_url.scheme()); return (scheme_iter != schemes.cend() && scheme_iter->second) - ? stdex::invoke( + ? std::invoke( std::forward(f), scheme_iter->second, resolved_url.path()) diff --git a/sources/enduro2d/core/window_impl/window_glfw.cpp b/sources/enduro2d/core/window_impl/window_glfw.cpp index 96a4974d..bbd112a9 100644 --- a/sources/enduro2d/core/window_impl/window_glfw.cpp +++ b/sources/enduro2d/core/window_impl/window_glfw.cpp @@ -322,7 +322,7 @@ namespace e2d std::lock_guard guard(rmutex); for ( const event_listener_uptr& listener : listeners ) { if ( listener ) { - stdex::invoke(f, *listener.get(), args...); + std::invoke(f, *listener.get(), args...); } } } diff --git a/sources/enduro2d/core/window_impl/window_none.cpp b/sources/enduro2d/core/window_impl/window_none.cpp index 9f044517..fee9948d 100644 --- a/sources/enduro2d/core/window_impl/window_none.cpp +++ b/sources/enduro2d/core/window_impl/window_none.cpp @@ -39,7 +39,7 @@ namespace e2d std::lock_guard guard(rmutex); for ( const event_listener_uptr& listener : listeners ) { if ( listener ) { - stdex::invoke(f, listener.get(), args...); + std::invoke(f, listener.get(), args...); } } }