Skip to content

Fix clang build #1560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2023
Merged

Fix clang build #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e2cb96
engine: Remove warning for jthread on clang.
heinezen Oct 3, 2023
3e408ea
renderer: Fix GLUniform substitution error for clang.
heinezen Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libopenage/engine/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ class jthread : public thread {
}
};
} // namespace std
#else
#error "jthread is supported now, remove custom definition"
#endif
#else
#include <stop_token>
Expand Down
2 changes: 1 addition & 1 deletion libopenage/renderer/opengl/shader_program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ GlShaderProgram::GlShaderProgram(const std::shared_ptr<GlContext> &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(),
Expand Down