From 4e28fd9e427779e3a99e8b14dea72562dc9f155d Mon Sep 17 00:00:00 2001
From: Marco Cattaneo <marco.cattaneo@cern.ch>
Date: Mon, 27 Apr 2020 16:34:00 +0200
Subject: [PATCH 1/2] Remove obsolete -U__MINGW32__ directive from dictionary
 linking

---
 Hlt/HltBase/CMakeLists.txt      | 4 +---
 Phys/LoKiTrigger/CMakeLists.txt | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Hlt/HltBase/CMakeLists.txt b/Hlt/HltBase/CMakeLists.txt
index 4c4788a1c..b162794a0 100644
--- a/Hlt/HltBase/CMakeLists.txt
+++ b/Hlt/HltBase/CMakeLists.txt
@@ -27,8 +27,6 @@ gaudi_add_dictionary(HltBase
                      dict/HltBaseDict.h
                      dict/HltBaseDict.xml
                      INCLUDE_DIRS Boost
-                     LINK_LIBRARIES Boost DetDescLib HltEvent RecEvent TrackEvent GaudiAlgLib HltInterfaces LHCbMathLib LoKiCoreLib HltBase
-                     OPTIONS "-U__MINGW32__")
-
+                     LINK_LIBRARIES Boost DetDescLib HltEvent RecEvent TrackEvent GaudiAlgLib HltInterfaces LHCbMathLib LoKiCoreLib HltBase)
 
 gaudi_add_test(QMTest QMTEST)
diff --git a/Phys/LoKiTrigger/CMakeLists.txt b/Phys/LoKiTrigger/CMakeLists.txt
index e66d90c17..16a21ee08 100644
--- a/Phys/LoKiTrigger/CMakeLists.txt
+++ b/Phys/LoKiTrigger/CMakeLists.txt
@@ -35,8 +35,7 @@ gaudi_add_dictionary(LoKiTrigger
                      dict/LoKiTriggerDict.h
                      dict/LoKiTrigger.xml
                      INCLUDE_DIRS Tr/TrackInterfaces
-                     LINK_LIBRARIES DetDescLib L0Event TrackEvent HltBase KalmanFilter DaVinciKernelLib LoKiCoreLib LoKiTracksLib LoKiTriggerLib
-                     OPTIONS " -U__MINGW32__ ")
+                     LINK_LIBRARIES DetDescLib L0Event TrackEvent HltBase KalmanFilter DaVinciKernelLib LoKiCoreLib LoKiTracksLib LoKiTriggerLib)
 
 gaudi_install_python_modules()
 
-- 
GitLab


From 7b7818701f235a9b8102019414a94cf67046ec03 Mon Sep 17 00:00:00 2001
From: Marco Cattaneo <cattanem@lxplus792.cern.ch>
Date: Thu, 23 Apr 2020 17:11:39 +0200
Subject: [PATCH 2/2] Remove ifdef WIN32

---
 Hlt/HltBase/Event/HltCandidate.h         | 9 ---------
 Hlt/HltBase/Event/HltL0DiMuonCandidate.h | 8 --------
 Hlt/HltBase/Event/HltMultiTrack.h        | 6 ------
 Hlt/HltBase/Event/HltStage.h             | 9 ---------
 4 files changed, 32 deletions(-)

diff --git a/Hlt/HltBase/Event/HltCandidate.h b/Hlt/HltBase/Event/HltCandidate.h
index 6ab209211..8e07b543b 100644
--- a/Hlt/HltBase/Event/HltCandidate.h
+++ b/Hlt/HltBase/Event/HltCandidate.h
@@ -22,15 +22,6 @@
 #include "Event/HltStage.h"
 #include "Event/NamedEntry.h"
 // ============================================================================
-#ifdef _WIN32
-// ============================================================================
-// Avoid conflict of Windows macro with std::max
-// ============================================================================
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-// ============================================================================
 // Allocators from  Gaudi
 // ============================================================================
 #include "GaudiKernel/boost_allocator.h"
diff --git a/Hlt/HltBase/Event/HltL0DiMuonCandidate.h b/Hlt/HltBase/Event/HltL0DiMuonCandidate.h
index 207b5df8a..10af7eb77 100644
--- a/Hlt/HltBase/Event/HltL0DiMuonCandidate.h
+++ b/Hlt/HltBase/Event/HltL0DiMuonCandidate.h
@@ -12,14 +12,6 @@
 #include "Event/L0MuonCandidate.h"
 #include "GaudiKernel/ContainedObject.h"
 #include "GaudiKernel/ObjectVector.h"
-// ============================================================================
-#ifdef _WIN32
-// Avoid conflict of Windows macro with std::max
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-// ============================================================================
 #include "GaudiKernel/boost_allocator.h"
 #include "GaudiKernel/SmartRef.h"
 // ============================================================================
diff --git a/Hlt/HltBase/Event/HltMultiTrack.h b/Hlt/HltBase/Event/HltMultiTrack.h
index 6611f33cc..eb95a0d09 100644
--- a/Hlt/HltBase/Event/HltMultiTrack.h
+++ b/Hlt/HltBase/Event/HltMultiTrack.h
@@ -9,12 +9,6 @@
 #include "GaudiKernel/NamedRange.h"
 #include "GaudiKernel/ContainedObject.h"
 #include "GaudiKernel/ObjectVector.h"
-#ifdef _WIN32
-// Avoid conflict of Windows macro with std::max
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
 #include "GaudiKernel/boost_allocator.h"
 #include "GaudiKernel/SmartRef.h"
 #include <vector>
diff --git a/Hlt/HltBase/Event/HltStage.h b/Hlt/HltBase/Event/HltStage.h
index c6a7127e7..40a4998a8 100644
--- a/Hlt/HltBase/Event/HltStage.h
+++ b/Hlt/HltBase/Event/HltStage.h
@@ -41,15 +41,6 @@
 #include "Event/HltL0DiMuonCandidate.h"
 #include "HltBase/Cache.h"
 // =============================================================================
-#ifdef _WIN32
-// =============================================================================
-// Avoid conflict of Windows macro with std::max
-// =============================================================================
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-// =============================================================================
 // allocators form Boost
 // =============================================================================
 #include "GaudiKernel/boost_allocator.h"
-- 
GitLab