diff --git a/libopenage/engine/engine.h b/libopenage/engine/engine.h index cd4d848c14..da56e4ead0 100644 --- a/libopenage/engine/engine.h +++ b/libopenage/engine/engine.h @@ -25,8 +25,6 @@ class jthread : public thread { } }; } // namespace std -#else -#error "jthread is supported now, remove custom definition" #endif #else #include diff --git a/libopenage/renderer/opengl/shader_program.cpp b/libopenage/renderer/opengl/shader_program.cpp index f5a2315072..67127ecc1f 100644 --- a/libopenage/renderer/opengl/shader_program.cpp +++ b/libopenage/renderer/opengl/shader_program.cpp @@ -204,7 +204,7 @@ GlShaderProgram::GlShaderProgram(const std::shared_ptr &context, GLuint loc = glGetUniformLocation(handle, name.data()); - this->uniforms.emplace_back(type, loc); + this->uniforms.push_back({type, loc}); this->uniforms_by_name.insert(std::make_pair( name.data(),