From 741b8f8dacda47808dc54fd7d4b6ad54cb59c7a2 Mon Sep 17 00:00:00 2001
From: Bertrand Bellenot <bertrand.bellenot@cern.ch>
Date: Mon, 17 Mar 2014 15:23:56 +0100
Subject: [PATCH] Use correct exception handling flag in Makefile.win32 and
silent a Compiler warning on Windows (Visual C++ does not implement checked
exceptions)
---
test/Makefile.win32 | 2 +-
test/stressTMVA.cxx | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/test/Makefile.win32 b/test/Makefile.win32
index 83f02c27331..9a0231dd8ef 100644
--- a/test/Makefile.win32
+++ b/test/Makefile.win32
@@ -68,7 +68,7 @@ dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
!endif
CC = $(cc)
CXX = $(cc)
-CXXFLAGS = -nologo -EHsc- -GR -DWIN32 -W3 -D_WIN32 -D_WINDOWS \
+CXXFLAGS = -nologo -EHs -GR -DWIN32 -W3 -D_WIN32 -D_WINDOWS \
-I$(ROOTSYS)/include -wd4244 \
-FIw32pragma.h
LD = $(link)
diff --git a/test/stressTMVA.cxx b/test/stressTMVA.cxx
index 8ebaef04f2e..2c0ff4d2393 100644
--- a/test/stressTMVA.cxx
+++ b/test/stressTMVA.cxx
@@ -164,6 +164,10 @@ namespace UnitTesting
#include "TMath.h"
#include <typeinfo>
+#ifdef WIN32
+#pragma warning(disable: 4290)
+#endif
+
using namespace std;
using namespace UnitTesting;
--
GitLab