From 391dcd32ad97e2186ed84bf93fa664543232faf4 Mon Sep 17 00:00:00 2001 From: Redacted Date: Wed, 28 May 2025 14:54:01 -0400 Subject: [PATCH] Fix double scope causing build error --- .gitignore | 6 ++++++ src/EditorApp.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..52c505d --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +/.idea +/.cache +/.ccls-cache +/compile_commands.json +/cmake-build-debug +/build diff --git a/src/EditorApp.cpp b/src/EditorApp.cpp index ee75691..2fa2f33 100644 --- a/src/EditorApp.cpp +++ b/src/EditorApp.cpp @@ -258,7 +258,7 @@ namespace misc { std::vector string_expand(const std::string& input, char delimiter = ' '); bool string_matches(const std::string& x, const std::vector& v); - std::vector misc::string_expand(const std::string& input, char delimiter) + std::vector string_expand(const std::string& input, char delimiter) { std::vector result; std::stringstream ss (input); @@ -271,7 +271,7 @@ namespace misc { } - auto misc::string_matches(const std::string &x, const std::vector &v) -> bool { + auto string_matches(const std::string &x, const std::vector &v) -> bool { return std::find(v.begin(), v.end(), x) != v.end();