godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Change warning muting so it affects all levels, but locally

Browse Source 
(cherry picked from commit 9cbc3f1419)
This commit is contained in:
Pedro J. Estébanez
2024-08-26 12:33:19 +02:00
parent fe2e862e2e
commit 1fd87e8747
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@@ -856,7 +856,7 @@ else: # GCC, Clang
if cc_version_major >= 11: # Broke on MethodBind templates before GCC 11. if cc_version_major >= 11: # Broke on MethodBind templates before GCC 11.
env.Append(CCFLAGS=["-Wlogical-op"]) env.Append(CCFLAGS=["-Wlogical-op"])
elif methods.using_clang(env) or methods.using_emcc(env): elif methods.using_clang(env) or methods.using_emcc(env):
env.Append(CCFLAGS=["-Wimplicit-fallthrough", "-Wno-undefined-var-template"]) env.Append(CCFLAGS=["-Wimplicit-fallthrough"])
elif env["warnings"] == "all": elif env["warnings"] == "all":
env.Append(CCFLAGS=["-Wall"] + common_warnings) env.Append(CCFLAGS=["-Wall"] + common_warnings)
elif env["warnings"] == "moderate": elif env["warnings"] == "moderate":

9
core/os/safe_binary_mutex.h
View File

@@ -37,6 +37,11 @@
#ifdef THREADS_ENABLED #ifdef THREADS_ENABLED
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wundefined-var-template"
#endif
// A very special kind of mutex, used in scenarios where these // A very special kind of mutex, used in scenarios where these
// requirements hold at the same time: // requirements hold at the same time:
// - Must be used with a condition variable (only binary mutexes are suitable). // - Must be used with a condition variable (only binary mutexes are suitable).
@@ -105,6 +110,10 @@ public:
} }
}; };
#ifdef __clang__
#pragma clang diagnostic pop
#endif
#else // No threads. #else // No threads.
template <int Tag> template <int Tag>