From 90a88488d332e5426487bd93919ae40f7f247f53 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 21 Jun 2011 09:00:01 +0000 Subject: [PATCH] Disabled VisualStudio warning warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable --- src/osg/glu/libtess/tess.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osg/glu/libtess/tess.h b/src/osg/glu/libtess/tess.h index 3bda56ab5..1d6052652 100644 --- a/src/osg/glu/libtess/tess.h +++ b/src/osg/glu/libtess/tess.h @@ -39,8 +39,11 @@ #include #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS) - // disable "structure was padded due to __declspec(align()) + // disable: structure was padded due to __declspec(align()) #pragma warning( disable : 4324 ) + + // disable: warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable + #pragma warning( disable : 4611) #endif #ifndef GLAPIENTRY