diff options
| -rw-r--r-- | Jamroot.jam | 1 | ||||
| -rw-r--r-- | gfx/gl/shader.cpp | 4 | ||||
| -rw-r--r-- | lib/filesystem.cpp | 2 | ||||
| -rw-r--r-- | lib/filesystem.h | 2 | ||||
| m--------- | thirdparty/ctre | 0 |
5 files changed, 4 insertions, 5 deletions
diff --git a/Jamroot.jam b/Jamroot.jam index b07dfdd..8587aaa 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -1,4 +1,3 @@ -using gcc ; using pkg-config ; import pkg-config ; import testing ; diff --git a/gfx/gl/shader.cpp b/gfx/gl/shader.cpp index 931c372..9a4c270 100644 --- a/gfx/gl/shader.cpp +++ b/gfx/gl/shader.cpp @@ -63,8 +63,8 @@ Shader::compile() const }; if (lookups) { std::basic_string<GLchar> textMod {text}; - for (const auto & match : ctre::range<R"(\bGL_[A-Z_]+\b)">(textMod)) { - if (const auto lookup = std::find_if(LOOKUPS.begin(), LOOKUPS.end(), + for (const auto & match : ctre::search_all<R"(\bGL_[A-Z_]+\b)">(textMod)) { + if (const auto * const lookup = std::find_if(LOOKUPS.begin(), LOOKUPS.end(), [&match](const auto & lookup) { return std::get<std::string_view>(lookup) == match; }); diff --git a/lib/filesystem.cpp b/lib/filesystem.cpp index 7e8ab9c..5c0c6f8 100644 --- a/lib/filesystem.cpp +++ b/lib/filesystem.cpp @@ -37,7 +37,7 @@ namespace filesystem { } // NOLINTNEXTLINE(hicpp-vararg) - fh::fh(const char * path, int flags, int mode) : h {open(path, flags, mode)} + fh::fh(const char * path, int flags, mode_t mode) : h {open(path, flags, mode)} { if (h == -1) { throw_filesystem_error("open", errno, path); diff --git a/lib/filesystem.h b/lib/filesystem.h index b076f43..92dc08d 100644 --- a/lib/filesystem.h +++ b/lib/filesystem.h @@ -30,7 +30,7 @@ namespace filesystem { class [[nodiscard]] fh final { public: - fh(const char * path, int flags, int mode); + fh(const char * path, int flags, mode_t mode); ~fh(); NO_MOVE(fh); NO_COPY(fh); diff --git a/thirdparty/ctre b/thirdparty/ctre -Subproject b3d7788b559e34d985c8530c3e0e7260b67505a +Subproject acb2f4de2e24a06280088377e47534137c0bc75 |