From c6cb0b19a72845481807440160998b314973fe98 Mon Sep 17 00:00:00 2001 From: Marcus Sonestedt Date: Thu, 22 Sep 2016 09:16:01 +0200 Subject: [PATCH] fcd2code: Disable exception specifier warning when building with MSVC2010 --- Tools/fcd2code/TemplateFieldContainerBase_cpp.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Tools/fcd2code/TemplateFieldContainerBase_cpp.txt b/Tools/fcd2code/TemplateFieldContainerBase_cpp.txt index 03447833e..0dd4c81a0 100644 --- a/Tools/fcd2code/TemplateFieldContainerBase_cpp.txt +++ b/Tools/fcd2code/TemplateFieldContainerBase_cpp.txt @@ -58,6 +58,11 @@ #include #include +#ifdef WIN32 +#pragma warning(disable: 4355) // turn off 'this' : used in base member initializer list warning +#pragma warning(disable: 4290) // disable exception specification warning +#endif + #include "@!HeaderPrefix!@@!Package!@Config.h" @@AdditionalIncludes@@ @@ -81,10 +86,6 @@ #include -#ifdef WIN32 // turn off 'this' : used in base member initializer list warning -#pragma warning(disable:4355) -#endif - OSG_BEGIN_NAMESPACE @@if inExternalNamespace -- 2.11.4.GIT