From 1f251b4df59702a7184a99277c341eaf489bbe44 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 23 Mar 2009 16:31:50 +0000 Subject: [PATCH] From Csaba Halasz, "I have modified FltExportVisitor to use _MSC_VER instead of _WIN32 in the condition around a #pragma warning that is specific to visual studio as _WIN32 is also defined for mingw compile but the #pragma is not applicable there." --- src/osgPlugins/OpenFlight/FltExportVisitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgPlugins/OpenFlight/FltExportVisitor.cpp b/src/osgPlugins/OpenFlight/FltExportVisitor.cpp index 437fdb22a..cb3b53a4c 100644 --- a/src/osgPlugins/OpenFlight/FltExportVisitor.cpp +++ b/src/osgPlugins/OpenFlight/FltExportVisitor.cpp @@ -50,7 +50,7 @@ #include #include -#ifdef _WIN32 +#ifdef _MSC_VER // Disable this warning. It's OK for us to use 'this' in initializer list, // as the texturePaletteManager merely stores a ref to it. #pragma warning( disable : 4355 )