From b5e306f7d89e82984a37824a3640bd67a5c45d61 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 14 Aug 2024 11:01:02 -0400
Subject: Enable /permissive- on MSVC for better standards conformance  (#2251)

* Enable /permissive- on MSVC for better C++ conformance and fix related errors

* Clean up left over warning suppressions from old library or msvc versions
---
 indra/llprimitive/lldaeloader.cpp             | 10 ++--------
 indra/llprimitive/tests/llmediaentry_test.cpp |  9 ++-------
 2 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'indra/llprimitive')

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 3e84eeffc2..4f47f16e33 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -24,10 +24,8 @@
  * $/LicenseInfo$
  */
 
-#if LL_MSVC
-#pragma warning (disable : 4263)
-#pragma warning (disable : 4264)
-#endif
+#include "linden_common.h"
+
 #include "dae.h"
 #include "dom/domAsset.h"
 #include "dom/domBind_material.h"
@@ -48,10 +46,6 @@
 #include "dom/domScale.h"
 #include "dom/domTranslate.h"
 #include "dom/domVisual_scene.h"
-#if LL_MSVC
-#pragma warning (default : 4263)
-#pragma warning (default : 4264)
-#endif
 
 #include "lldaeloader.h"
 #include "llsdserialize.h"
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp
index e8f40d1ffd..414df66680 100644
--- a/indra/llprimitive/tests/llmediaentry_test.cpp
+++ b/indra/llprimitive/tests/llmediaentry_test.cpp
@@ -26,14 +26,9 @@
 
 #include "linden_common.h"
 #include "lltut.h"
-#if LL_WINDOWS
-#pragma warning (push)
-#pragma warning (disable : 4702) // boost::lexical_cast generates this warning
-#endif
+
 #include <boost/lexical_cast.hpp>
-#if LL_WINDOWS
-#pragma warning (pop)
-#endif
+
 #include "llstring.h"
 #include "llsdutil.h"
 #include "llsdserialize.h"
-- 
cgit v1.2.3