From 51c39c92277c5acb052d553a6edf58f55bd5561f Mon Sep 17 00:00:00 2001 From: Marco Cattaneo <marco.cattaneo@cern.ch> Date: Tue, 21 Sep 2021 16:36:31 +0200 Subject: [PATCH 1/2] Remove INTEL_COMPILER ifdefs, icc not supported on this branch --- Hlt/HltBase/dict/HltBaseDict.h | 15 --------------- Phys/LoKiTrigger/LoKi/HltFunctions.h | 9 --------- Phys/LoKiTrigger/LoKi/HltStages.h | 12 ------------ Phys/LoKiTrigger/LoKi/LoKiTrigger_dct.h | 4 ---- Phys/LoKiTrigger/LoKi/OldTypes.h | 9 --------- Phys/LoKiTrigger/LoKi/RecVertices.h | 12 ------------ Phys/LoKiTrigger/src/CaloHelperTool.cpp | 10 ---------- Phys/LoKiTrigger/src/CheatPID.cpp | 9 --------- Phys/LoKiTrigger/src/HelperTool.cpp | 10 ---------- Phys/LoKiTrigger/src/Hlt1Combiner.cpp | 8 -------- Phys/LoKiTrigger/src/Hlt1DiPhotonMaker.cpp | 8 -------- Phys/LoKiTrigger/src/Hlt1Functions.cpp | 9 --------- Phys/LoKiTrigger/src/L0CaloToParticles.cpp | 8 -------- Phys/LoKiTrigger/src/MatchTool.cpp | 10 ---------- Phys/LoKiTrigger/src/ToParticles.cpp | 8 -------- Phys/LoKiTrigger/src/ToProtoParticles.cpp | 8 -------- Phys/LoKiTrigger/src/UpgradeTool.cpp | 11 ----------- Phys/LoKiTrigger/src/VxCreator.cpp | 8 -------- Phys/LoKiTrigger/src/VxMaker.cpp | 8 -------- 19 files changed, 176 deletions(-) diff --git a/Hlt/HltBase/dict/HltBaseDict.h b/Hlt/HltBase/dict/HltBaseDict.h index 4df7ecefd..d6920e2d1 100644 --- a/Hlt/HltBase/dict/HltBaseDict.h +++ b/Hlt/HltBase/dict/HltBaseDict.h @@ -11,12 +11,6 @@ #ifndef DICT_HLTBASEDICT_H #define DICT_HLTBASEDICT_H 1 // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( disable \ - : 2259 ) // non-pointer conversion ... may lose significant bits -#pragma warning( push ) -#endif -// ============================================================================ #include "HltBase/IMatchTVeloTracks.h" #include "HltBase/ITrackConfirmTool.h" #include "HltBase/ITrackL0CaloMatchTool.h" @@ -37,15 +31,6 @@ #include "HltBase/HltUtils.h" #include "HltBase/ITrack2CandidateMatch.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( pop ) -#endif -// ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( disable : 177 ) // variable ... was declared but never referenced -#pragma warning( disable : 191 ) // type qualifier is meaningless on cast type -#endif -// ============================================================================ namespace HltBaseDict { struct __Instantiations diff --git a/Phys/LoKiTrigger/LoKi/HltFunctions.h b/Phys/LoKiTrigger/LoKi/HltFunctions.h index b19bacfe5..4fd27aece 100755 --- a/Phys/LoKiTrigger/LoKi/HltFunctions.h +++ b/Phys/LoKiTrigger/LoKi/HltFunctions.h @@ -46,11 +46,6 @@ namespace LoKi // ========================================================================== namespace Tracks { - // ======================================================================== -#ifdef __INTEL_COMPILER -#pragma warning(disable:654) // overloaded virtual function is only partially overridden -#pragma warning(push) -#endif // ======================================================================== /** @class DistanceOfClosestApproach * Evaluate the distance of the closest approach between two tracks. @@ -261,10 +256,6 @@ namespace LoKi { return s << "TTrDA" ; } } ; // ======================================================================== -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif - // ======================================================================== } // end of namespace LoKi::Tracks // ========================================================================== } // end of namespace LoKi diff --git a/Phys/LoKiTrigger/LoKi/HltStages.h b/Phys/LoKiTrigger/LoKi/HltStages.h index e8dd5e1a2..46ce9f99b 100644 --- a/Phys/LoKiTrigger/LoKi/HltStages.h +++ b/Phys/LoKiTrigger/LoKi/HltStages.h @@ -849,14 +849,6 @@ namespace LoKi // ========================================================================== namespace Cuts { - // ======================================================================== - // Suppress Intel compiler warnings about missing default constructor - // In this case the compiler generated constructor is fine, since there are - // no member data to be initialised -#ifdef __INTEL_COMPILER -#pragma warning(disable:854) -#pragma warning(push) -#endif // ======================================================================== /** @var TS_ISTRACK * trivial predicate to check the type of Hlt::Stage @@ -1123,10 +1115,6 @@ namespace LoKi */ typedef LoKi::Stages::Cache2 TS_CACHE_BOOL ; // ======================================================================== -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif - // ======================================================================== } // end of namespace LoKi::Cuts // ========================================================================== } // end of namespace LoKi diff --git a/Phys/LoKiTrigger/LoKi/LoKiTrigger_dct.h b/Phys/LoKiTrigger/LoKi/LoKiTrigger_dct.h index 5a5104215..37029ab39 100755 --- a/Phys/LoKiTrigger/LoKi/LoKiTrigger_dct.h +++ b/Phys/LoKiTrigger/LoKi/LoKiTrigger_dct.h @@ -123,10 +123,6 @@ * */ // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:191) // type qualifier is meaningless on cast type -#endif -// ============================================================================ namespace LoKi { // ========================================================================== diff --git a/Phys/LoKiTrigger/LoKi/OldTypes.h b/Phys/LoKiTrigger/LoKi/OldTypes.h index 35fe45792..1dfad7d7b 100755 --- a/Phys/LoKiTrigger/LoKi/OldTypes.h +++ b/Phys/LoKiTrigger/LoKi/OldTypes.h @@ -24,11 +24,6 @@ #include "Event/Track.h" #include "Event/RecVertex.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:654) // overloaded virtual function is only partially overridden -#pragma warning(push) -#endif -// ============================================================================ namespace LoKi { // ========================================================================== @@ -206,10 +201,6 @@ namespace LoKi // ========================================================================== } // end of namespace LoKi // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif -// ============================================================================ namespace LoKi { // ========================================================================== diff --git a/Phys/LoKiTrigger/LoKi/RecVertices.h b/Phys/LoKiTrigger/LoKi/RecVertices.h index 951ab3d8a..7d18bdffd 100755 --- a/Phys/LoKiTrigger/LoKi/RecVertices.h +++ b/Phys/LoKiTrigger/LoKi/RecVertices.h @@ -166,14 +166,6 @@ namespace LoKi // ========================================================================== namespace Cuts { - // ======================================================================== - // Suppress Intel compiler warnings about missing default constructor - // In this case the compiler generated constructor is fine, since there are - // no member data to be initialised -#ifdef __INTEL_COMPILER -#pragma warning(disable:854) -#pragma warning(push) -#endif // ======================================================================== /** @var RV_MAXDOCA * Simple evaluator for "DOCA-max" between all tracks in @@ -233,10 +225,6 @@ namespace LoKi */ typedef LoKi::RecVertices::DOCACut RV_DOCACUT ; // ======================================================================== -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif - // ======================================================================== } // end of namespace LoKi::Cuts // ========================================================================== } // end of namespace LoKi diff --git a/Phys/LoKiTrigger/src/CaloHelperTool.cpp b/Phys/LoKiTrigger/src/CaloHelperTool.cpp index 3e0b8be2a..6e5c804ae 100644 --- a/Phys/LoKiTrigger/src/CaloHelperTool.cpp +++ b/Phys/LoKiTrigger/src/CaloHelperTool.cpp @@ -23,12 +23,6 @@ // ============================================================================ #include "GaudiAlg/GaudiAlgorithm.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( disable \ - : 1572 ) // non-pointer conversion ... may lose significant bits -#pragma warning( push ) -#endif -// ============================================================================ // HltBase // ============================================================================ #include "HltBase/HltUtils.h" @@ -44,10 +38,6 @@ // ============================================================================ #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( pop ) -#endif -// ============================================================================ /** @file * Implementation file for class LoKi::Hlt1::CaloHelperTool * @author Albert Puig (albert.puig@epfl.ch) diff --git a/Phys/LoKiTrigger/src/CheatPID.cpp b/Phys/LoKiTrigger/src/CheatPID.cpp index a9a68b47e..8176e80c9 100644 --- a/Phys/LoKiTrigger/src/CheatPID.cpp +++ b/Phys/LoKiTrigger/src/CheatPID.cpp @@ -11,11 +11,6 @@ // ============================================================================ // Include files // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif -// ============================================================================ // HltBase // ============================================================================ #include "HltBase/HltUtils.h" @@ -38,10 +33,6 @@ #include "LoKi/ILoKiSvc.h" #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif -// ============================================================================ /** @file * * Implementation file for class LoKi::Hlt1::CheatPID diff --git a/Phys/LoKiTrigger/src/HelperTool.cpp b/Phys/LoKiTrigger/src/HelperTool.cpp index e86bb3670..4020dfea7 100644 --- a/Phys/LoKiTrigger/src/HelperTool.cpp +++ b/Phys/LoKiTrigger/src/HelperTool.cpp @@ -23,12 +23,6 @@ // ============================================================================ #include "GaudiAlg/GaudiAlgorithm.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( disable \ - : 1572 ) // non-pointer conversion ... may lose significant bits -#pragma warning( push ) -#endif -// ============================================================================ // HltBase // ============================================================================ #include "HltBase/HltUtils.h" @@ -46,10 +40,6 @@ // ============================================================================ #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( pop ) -#endif -// ============================================================================ /** @file * Implementation file for class LoKi::Hlt1::HelperTool * @date 2010-10-30 diff --git a/Phys/LoKiTrigger/src/Hlt1Combiner.cpp b/Phys/LoKiTrigger/src/Hlt1Combiner.cpp index 3d7535bb8..04e7b1194 100644 --- a/Phys/LoKiTrigger/src/Hlt1Combiner.cpp +++ b/Phys/LoKiTrigger/src/Hlt1Combiner.cpp @@ -15,11 +15,6 @@ // ============================================================================ #include <memory> // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif -// ============================================================================ // HltBase // ============================================================================ #include "HltBase/HltUtils.h" @@ -47,9 +42,6 @@ #include "LoKi/GetPhysDesktop.h" // ============================================================================ #include "LTTools.h" -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif // ============================================================================ /** @file * diff --git a/Phys/LoKiTrigger/src/Hlt1DiPhotonMaker.cpp b/Phys/LoKiTrigger/src/Hlt1DiPhotonMaker.cpp index 2699cf6f8..e5e536e0d 100644 --- a/Phys/LoKiTrigger/src/Hlt1DiPhotonMaker.cpp +++ b/Phys/LoKiTrigger/src/Hlt1DiPhotonMaker.cpp @@ -11,10 +11,6 @@ // ============================================================================ // Include files // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif // ============================================================================ // HltBase // ============================================================================ @@ -38,10 +34,6 @@ #include "LoKi/ILoKiSvc.h" #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif -// ============================================================================ /** @file * * Implementation file for class LoKi::Hlt1::Hlt1DiPhotonMaker diff --git a/Phys/LoKiTrigger/src/Hlt1Functions.cpp b/Phys/LoKiTrigger/src/Hlt1Functions.cpp index 0a9f035bd..e797b4091 100644 --- a/Phys/LoKiTrigger/src/Hlt1Functions.cpp +++ b/Phys/LoKiTrigger/src/Hlt1Functions.cpp @@ -34,15 +34,6 @@ // ============================================================================ #include "KalmanFilter/FastVertex.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( disable : 177 ) // variable ... was declared but never referenced -#pragma warning( push ) -#endif -// ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( pop ) -#endif -// ============================================================================ /** @file * implementation file for classed form the file LoKi/Hlt1Functions.h * diff --git a/Phys/LoKiTrigger/src/L0CaloToParticles.cpp b/Phys/LoKiTrigger/src/L0CaloToParticles.cpp index b09bf034e..cb37b8c84 100644 --- a/Phys/LoKiTrigger/src/L0CaloToParticles.cpp +++ b/Phys/LoKiTrigger/src/L0CaloToParticles.cpp @@ -11,10 +11,6 @@ // ============================================================================ // Include files // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif // ============================================================================ // HltBase // ============================================================================ @@ -38,10 +34,6 @@ #include "LoKi/ILoKiSvc.h" #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif -// ============================================================================ /** @file * * Implementation file for class LoKi::Hlt1::L0CaloToParticles diff --git a/Phys/LoKiTrigger/src/MatchTool.cpp b/Phys/LoKiTrigger/src/MatchTool.cpp index 94cddd8d1..9e94f572d 100644 --- a/Phys/LoKiTrigger/src/MatchTool.cpp +++ b/Phys/LoKiTrigger/src/MatchTool.cpp @@ -15,12 +15,6 @@ // ============================================================================ #include "GaudiAlg/GaudiAlgorithm.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( disable \ - : 1572 ) // non-pointer conversion ... may lose significant bits -#pragma warning( push ) -#endif -// ============================================================================ // Kernel // ============================================================================ #include "Kernel/IANNSvc.h" @@ -38,10 +32,6 @@ // ============================================================================ #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning( pop ) -#endif -// ============================================================================ /** @file * Implementation file for class LoKi::Hlt1::MatchTool * diff --git a/Phys/LoKiTrigger/src/ToParticles.cpp b/Phys/LoKiTrigger/src/ToParticles.cpp index 549ca41e6..0febb1a1e 100644 --- a/Phys/LoKiTrigger/src/ToParticles.cpp +++ b/Phys/LoKiTrigger/src/ToParticles.cpp @@ -11,10 +11,6 @@ // ============================================================================ // Include files // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif // ============================================================================ // HltBase // ============================================================================ @@ -38,10 +34,6 @@ #include "LoKi/ILoKiSvc.h" #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif -// ============================================================================ /** @file * * Implementation file for class LoKi::Hlt1::ToParticles diff --git a/Phys/LoKiTrigger/src/ToProtoParticles.cpp b/Phys/LoKiTrigger/src/ToProtoParticles.cpp index 392d514ec..f99d2ab26 100644 --- a/Phys/LoKiTrigger/src/ToProtoParticles.cpp +++ b/Phys/LoKiTrigger/src/ToProtoParticles.cpp @@ -11,10 +11,6 @@ // ============================================================================ // Include files // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif // ============================================================================ // HltBase // ============================================================================ @@ -38,10 +34,6 @@ #include "LoKi/ILoKiSvc.h" #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif -// ============================================================================ /** @file * * Implementation file for class LoKi::Hlt1::ToProtoParticles diff --git a/Phys/LoKiTrigger/src/UpgradeTool.cpp b/Phys/LoKiTrigger/src/UpgradeTool.cpp index b7cc708b5..5822a0696 100755 --- a/Phys/LoKiTrigger/src/UpgradeTool.cpp +++ b/Phys/LoKiTrigger/src/UpgradeTool.cpp @@ -25,11 +25,6 @@ // ============================================================================ #include "GaudiAlg/GaudiAlgorithm.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif -// ============================================================================ // HltBase // ============================================================================ #include "HltBase/HltUtils.h" @@ -44,9 +39,6 @@ // Local // ============================================================================ #include "LTTools.h" -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif // ============================================================================ /** @file * Implementation file for class LoKi::Hlt1::UpgradeTool @@ -58,9 +50,6 @@ namespace { // ========================================================================== -#ifdef __INTEL_COMPILER -#pragma warning(disable:177) // function .. was declared but never referenced -#endif #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-function" diff --git a/Phys/LoKiTrigger/src/VxCreator.cpp b/Phys/LoKiTrigger/src/VxCreator.cpp index cf10ed5cc..927342659 100755 --- a/Phys/LoKiTrigger/src/VxCreator.cpp +++ b/Phys/LoKiTrigger/src/VxCreator.cpp @@ -11,10 +11,6 @@ // ============================================================================ // Include files // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif // ============================================================================ // HltBase // ============================================================================ @@ -29,10 +25,6 @@ // ============================================================================ #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif -// ============================================================================ /** @file * Implementation file for class LoKi::Hlt1::VxCreator * @date 2008-11-14 diff --git a/Phys/LoKiTrigger/src/VxMaker.cpp b/Phys/LoKiTrigger/src/VxMaker.cpp index 50b7d1aa2..50ccc71bd 100755 --- a/Phys/LoKiTrigger/src/VxMaker.cpp +++ b/Phys/LoKiTrigger/src/VxMaker.cpp @@ -11,10 +11,6 @@ // ============================================================================ // Include files // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits -#pragma warning(push) -#endif // ============================================================================ // HltBase // ============================================================================ @@ -38,10 +34,6 @@ #include "LoKi/Constants.h" #include "LTTools.h" // ============================================================================ -#ifdef __INTEL_COMPILER -#pragma warning(pop) -#endif -// ============================================================================ /** @file * * Implementation file for class LoKi::Hlt1::VxMaker -- GitLab From 3dbd3e2154cf91a84993d05e15097e618ed73038 Mon Sep 17 00:00:00 2001 From: Marco Cattaneo <marco.cattaneo@cern.ch> Date: Tue, 21 Sep 2021 16:41:07 +0200 Subject: [PATCH 2/2] Remove Windows ifdefs and link options, not supported on this branch --- Hlt/HltBase/CMakeLists.txt | 3 +-- Hlt/HltBase/Event/HltCandidate.h | 9 --------- Hlt/HltBase/Event/HltL0DiMuonCandidate.h | 7 ------- Hlt/HltBase/Event/HltMultiTrack.h | 6 ------ Hlt/HltBase/Event/HltStage.h | 9 --------- Phys/LoKiTrigger/CMakeLists.txt | 3 +-- 6 files changed, 2 insertions(+), 35 deletions(-) diff --git a/Hlt/HltBase/CMakeLists.txt b/Hlt/HltBase/CMakeLists.txt index 170b69841..efa3a7ad6 100644 --- a/Hlt/HltBase/CMakeLists.txt +++ b/Hlt/HltBase/CMakeLists.txt @@ -35,8 +35,7 @@ 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/Hlt/HltBase/Event/HltCandidate.h b/Hlt/HltBase/Event/HltCandidate.h index 8517f7868..4fe464713 100644 --- a/Hlt/HltBase/Event/HltCandidate.h +++ b/Hlt/HltBase/Event/HltCandidate.h @@ -33,15 +33,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 a6e561a01..be0718d63 100644 --- a/Hlt/HltBase/Event/HltL0DiMuonCandidate.h +++ b/Hlt/HltBase/Event/HltL0DiMuonCandidate.h @@ -24,13 +24,6 @@ #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 07291075c..dd9fc1fb6 100644 --- a/Hlt/HltBase/Event/HltMultiTrack.h +++ b/Hlt/HltBase/Event/HltMultiTrack.h @@ -19,12 +19,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 626d76a69..6ee0d43b5 100644 --- a/Hlt/HltBase/Event/HltStage.h +++ b/Hlt/HltBase/Event/HltStage.h @@ -51,15 +51,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" diff --git a/Phys/LoKiTrigger/CMakeLists.txt b/Phys/LoKiTrigger/CMakeLists.txt index c5916401c..a80ed1140 100644 --- a/Phys/LoKiTrigger/CMakeLists.txt +++ b/Phys/LoKiTrigger/CMakeLists.txt @@ -41,8 +41,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