From ac97c2ec15ae48b37070a2e745ee66af4b02726c Mon Sep 17 00:00:00 2001
From: Christophe <christophe@lunarg.com>
Date: Tue, 9 Jan 2024 15:01:33 +0100
Subject: [PATCH] Disable warnings by default

---
 glm/detail/setup.hpp                      |  6 ++--
 glm/detail/type_quat.hpp                  | 40 +++++++++++------------
 test/core/core_force_compiler_unknown.cpp | 24 ++++++++++++++
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 19953bcb4e..efc4ed6589 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -877,10 +877,10 @@ namespace detail
 ///////////////////////////////////////////////////////////////////////////////////
 // Silent warnings
 
-#ifdef GLM_FORCE_SILENT_WARNINGS
-#	define GLM_SILENT_WARNINGS GLM_ENABLE
-#else
+#ifdef GLM_FORCE_WARNINGS
 #	define GLM_SILENT_WARNINGS GLM_DISABLE
+#else
+#	define GLM_SILENT_WARNINGS GLM_ENABLE
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////////
diff --git a/glm/detail/type_quat.hpp b/glm/detail/type_quat.hpp
index d489e0a233..586785a7e2 100644
--- a/glm/detail/type_quat.hpp
+++ b/glm/detail/type_quat.hpp
@@ -15,16 +15,6 @@
 
 namespace glm
 {
-	template<typename T, qualifier Q>
-	struct qua
-	{
-		// -- Implementation detail --
-
-		typedef qua<T, Q> type;
-		typedef T value_type;
-
-		// -- Data --
-
 #		if GLM_SILENT_WARNINGS == GLM_ENABLE
 #			if GLM_COMPILER & GLM_COMPILER_GCC
 #				pragma GCC diagnostic push
@@ -39,6 +29,16 @@ namespace glm
 #			endif
 #		endif
 
+	template<typename T, qualifier Q>
+	struct qua
+	{
+		// -- Implementation detail --
+
+		typedef qua<T, Q> type;
+		typedef T value_type;
+
+		// -- Data --
+
 #		if GLM_LANG & GLM_LANG_CXXMS_FLAG
 			union
 			{
@@ -56,16 +56,6 @@ namespace glm
 #			else
 				T x, y, z, w;
 #			endif
-#		endif
-
-#		if GLM_SILENT_WARNINGS == GLM_ENABLE
-#			if GLM_COMPILER & GLM_COMPILER_CLANG
-#				pragma clang diagnostic pop
-#			elif GLM_COMPILER & GLM_COMPILER_GCC
-#				pragma GCC diagnostic pop
-#			elif GLM_COMPILER & GLM_COMPILER_VC
-#				pragma warning(pop)
-#			endif
 #		endif
 
 		// -- Component accesses --
@@ -139,6 +129,16 @@ namespace glm
 		GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q>& operator/=(U s);
 	};
 
+#		if GLM_SILENT_WARNINGS == GLM_ENABLE
+#			if GLM_COMPILER & GLM_COMPILER_CLANG
+#				pragma clang diagnostic pop
+#			elif GLM_COMPILER & GLM_COMPILER_GCC
+#				pragma GCC diagnostic pop
+#			elif GLM_COMPILER & GLM_COMPILER_VC
+#				pragma warning(pop)
+#			endif
+#		endif
+
 	// -- Unary bit operators --
 
 	template<typename T, qualifier Q>
diff --git a/test/core/core_force_compiler_unknown.cpp b/test/core/core_force_compiler_unknown.cpp
index 44d7fc3365..9dd24536c5 100644
--- a/test/core/core_force_compiler_unknown.cpp
+++ b/test/core/core_force_compiler_unknown.cpp
@@ -2,9 +2,33 @@
 #	define GLM_FORCE_COMPILER_UNKNOWN
 #endif
 
+#if GLM_SILENT_WARNINGS == GLM_ENABLE
+#	if defined(__GNUC__)
+#		pragma GCC diagnostic push
+#		pragma GCC diagnostic ignored "-Wpedantic"
+#	elif defined(__clang__)
+#		pragma clang diagnostic push
+#		pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
+#		pragma clang diagnostic ignored "-Wnested-anon-types"
+#	elif defined(_MSC_VER)
+#		pragma warning(push)
+#		pragma warning(disable: 4201)  // nonstandard extension used : nameless struct/union
+#	endif
+#endif
+
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>
 
+#if GLM_SILENT_WARNINGS == GLM_ENABLE
+#	if defined(__clang__)
+#		pragma clang diagnostic pop
+#	elif defined(__GNUC__)
+#		pragma GCC diagnostic pop
+#	elif defined(_MSC_VER)
+#		pragma warning(pop)
+#	endif
+#endif
+
 int main()
 {
 	int Error = 0;