diff --git a/Backends/include/gambit/Backends/backend_types/gm2calc_1_2_0/loaded_types.hpp b/Backends/include/gambit/Backends/backend_types/gm2calc_1_2_0/loaded_types.hpp index 8edfc0dca2..f7c201e753 100644 --- a/Backends/include/gambit/Backends/backend_types/gm2calc_1_2_0/loaded_types.hpp +++ b/Backends/include/gambit/Backends/backend_types/gm2calc_1_2_0/loaded_types.hpp @@ -1,7 +1,6 @@ #ifndef __loaded_types_gm2calc_1_2_0_hpp__ #define __loaded_types_gm2calc_1_2_0_hpp__ 1 -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include "wrapper_MSSMNoFV_onshell_susy_parameters.hpp" #include "wrapper_MSSMNoFV_onshell.hpp" #include "wrapper_MSSMNoFV_onshell_mass_eigenstates.hpp" @@ -14,7 +13,6 @@ #include "wrapper_EPhysicalProblem.hpp" #include "wrapper_EReadError.hpp" #include "identification.hpp" -#include "gambit/Utils/end_ignore_warnings.hpp" // Indicate which types are provided by this backend, and what the symbols of their factories are. #define gm2calc_1_2_0_all_data \ diff --git a/Backends/include/gambit/Backends/backend_types/gm2calc_1_3_0/loaded_types.hpp b/Backends/include/gambit/Backends/backend_types/gm2calc_1_3_0/loaded_types.hpp index d053d0dd03..fbece27b3a 100644 --- a/Backends/include/gambit/Backends/backend_types/gm2calc_1_3_0/loaded_types.hpp +++ b/Backends/include/gambit/Backends/backend_types/gm2calc_1_3_0/loaded_types.hpp @@ -1,7 +1,6 @@ #ifndef __loaded_types_gm2calc_1_3_0_hpp__ #define __loaded_types_gm2calc_1_3_0_hpp__ 1 -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include "wrapper_MSSMNoFV_onshell_susy_parameters.hpp" #include "wrapper_MSSMNoFV_onshell.hpp" #include "wrapper_MSSMNoFV_onshell_mass_eigenstates.hpp" @@ -14,7 +13,6 @@ #include "wrapper_EPhysicalProblem.hpp" #include "wrapper_EReadError.hpp" #include "identification.hpp" -#include "gambit/Utils/end_ignore_warnings.hpp" // Indicate which types are provided by this backend, and what the symbols of their factories are. #define gm2calc_1_3_0_all_data \ diff --git a/Backends/scripts/BOSS/configs/gm2calc_1_2_0.py b/Backends/scripts/BOSS/configs/gm2calc_1_2_0.py index c4145e76d2..7313ae1a89 100644 --- a/Backends/scripts/BOSS/configs/gm2calc_1_2_0.py +++ b/Backends/scripts/BOSS/configs/gm2calc_1_2_0.py @@ -119,14 +119,11 @@ # the BOSS-generated headers in GAMBIT. pragmas_begin = [ - '#include "gambit/Utils/begin_ignore_warnings_eigen.hpp"', # Contains pragmas to suppress warnings from Eigen ] pragmas_end = [ - '#include "gambit/Utils/end_ignore_warnings.hpp"', # Restores the warning settings ] - # ~~~~~ Extra code to surround BOSS-generated code included in GAMBIT ~~~~~ # The listed code will be added at the top/bottom in the frontend header file diff --git a/Backends/scripts/BOSS/configs/gm2calc_1_3_0.py b/Backends/scripts/BOSS/configs/gm2calc_1_3_0.py index 4fde742628..4071c09e70 100644 --- a/Backends/scripts/BOSS/configs/gm2calc_1_3_0.py +++ b/Backends/scripts/BOSS/configs/gm2calc_1_3_0.py @@ -119,14 +119,11 @@ # the BOSS-generated headers in GAMBIT. pragmas_begin = [ - '#include "gambit/Utils/begin_ignore_warnings_eigen.hpp"', # Contains pragmas to suppress warnings from Eigen ] pragmas_end = [ - '#include "gambit/Utils/end_ignore_warnings.hpp"', # Restores the warning settings ] - # ~~~~~ Extra code to surround BOSS-generated code included in GAMBIT ~~~~~ # The listed code will be added at the top/bottom in the frontend header file diff --git a/CMakeLists.txt b/CMakeLists.txt index ca6ef8c782..bafda0826d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -360,7 +360,7 @@ endif() # Check for Eigen find_package(Eigen3 3.1.0) if(EIGEN3_FOUND) - include_directories("${EIGEN3_INCLUDE_DIR}") + include_directories(SYSTEM "${EIGEN3_INCLUDE_DIR}") message("-- Eigen version: ${EIGEN3_VERSION}") else() message("${BoldRed} Eigen v3.1.0 or greater not found. FlexibleSUSY and GM2Calc interfaces will be excluded.${ColourReset}") diff --git a/ColliderBit/include/gambit/ColliderBit/analyses/AnalysisData.hpp b/ColliderBit/include/gambit/ColliderBit/analyses/AnalysisData.hpp index 4b63049065..7824d971ac 100644 --- a/ColliderBit/include/gambit/ColliderBit/analyses/AnalysisData.hpp +++ b/ColliderBit/include/gambit/ColliderBit/analyses/AnalysisData.hpp @@ -26,9 +26,7 @@ #pragma once -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include "Eigen/Core" -#include "gambit/Utils/end_ignore_warnings.hpp" #include #include diff --git a/ColliderBit/include/gambit/ColliderBit/analyses/SignalRegionData.hpp b/ColliderBit/include/gambit/ColliderBit/analyses/SignalRegionData.hpp index 4fe00850a4..dc10e90eae 100644 --- a/ColliderBit/include/gambit/ColliderBit/analyses/SignalRegionData.hpp +++ b/ColliderBit/include/gambit/ColliderBit/analyses/SignalRegionData.hpp @@ -26,9 +26,7 @@ #pragma once -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include "Eigen/Core" -#include "gambit/Utils/end_ignore_warnings.hpp" #include #include diff --git a/ColliderBit/src/LHC_likelihoods.cpp b/ColliderBit/src/LHC_likelihoods.cpp index 71e75d34c9..084e8fa7a0 100644 --- a/ColliderBit/src/LHC_likelihoods.cpp +++ b/ColliderBit/src/LHC_likelihoods.cpp @@ -52,9 +52,7 @@ #include "multimin/multimin.hpp" -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include "Eigen/Eigenvalues" -#include "gambit/Utils/end_ignore_warnings.hpp" #include diff --git a/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_139invfb.cpp b/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_139invfb.cpp index eb91ebffd0..db4907b64e 100644 --- a/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_139invfb.cpp +++ b/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_139invfb.cpp @@ -3,9 +3,7 @@ #include "gambit/ColliderBit/analyses/Cutflow.hpp" #include "gambit/ColliderBit/ATLASEfficiencies.hpp" -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include "Eigen/Eigen" -#include "gambit/Utils/end_ignore_warnings.hpp" // #define CHECK_CUTFLOW diff --git a/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_13invfb.cpp b/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_13invfb.cpp index 61896dd221..6b7e2c8c3a 100644 --- a/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_13invfb.cpp +++ b/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_13invfb.cpp @@ -3,9 +3,7 @@ #include "gambit/ColliderBit/analyses/Cutflow.hpp" #include "gambit/ColliderBit/ATLASEfficiencies.hpp" -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include "Eigen/Eigen" -#include "gambit/Utils/end_ignore_warnings.hpp" namespace Gambit { diff --git a/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_36invfb.cpp b/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_36invfb.cpp index dfee9f7788..74833a82be 100644 --- a/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_36invfb.cpp +++ b/ColliderBit/src/analyses/Analysis_ATLAS_13TeV_0LEP_36invfb.cpp @@ -4,9 +4,7 @@ #include "gambit/ColliderBit/ATLASEfficiencies.hpp" // #include "gambit/ColliderBit/analyses/Perf_Plot.hpp" -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include "Eigen/Eigen" -#include "gambit/Utils/end_ignore_warnings.hpp" namespace Gambit { diff --git a/DarkBit/src/Axions.cpp b/DarkBit/src/Axions.cpp index b28ff42847..75eac29be1 100644 --- a/DarkBit/src/Axions.cpp +++ b/DarkBit/src/Axions.cpp @@ -27,9 +27,7 @@ #include #include -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include -#include "gambit/Utils/end_ignore_warnings.hpp" #include #include diff --git a/NeutrinoBit/include/gambit/NeutrinoBit/NeutrinoBit_rollcall.hpp b/NeutrinoBit/include/gambit/NeutrinoBit/NeutrinoBit_rollcall.hpp index 61eb24a70d..c09143e3d3 100644 --- a/NeutrinoBit/include/gambit/NeutrinoBit/NeutrinoBit_rollcall.hpp +++ b/NeutrinoBit/include/gambit/NeutrinoBit/NeutrinoBit_rollcall.hpp @@ -35,10 +35,8 @@ #ifndef __NeutrinoBit_rollcall_hpp__ #define __NeutrinoBit_rollcall_hpp__ -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include #include -#include "gambit/Utils/end_ignore_warnings.hpp" #define MODULE NeutrinoBit #define REFERENCE Chrzaszcz:2019inj diff --git a/NeutrinoBit/src/NeutrinoBit.cpp b/NeutrinoBit/src/NeutrinoBit.cpp index 9842d58605..e59b7a8aff 100644 --- a/NeutrinoBit/src/NeutrinoBit.cpp +++ b/NeutrinoBit/src/NeutrinoBit.cpp @@ -26,9 +26,7 @@ #include #include -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include -#include "gambit/Utils/end_ignore_warnings.hpp" #include "gambit/Elements/gambit_module_headers.hpp" #include "gambit/Utils/statistics.hpp" diff --git a/ScannerBit/include/gambit/ScannerBit/py_module.hpp b/ScannerBit/include/gambit/ScannerBit/py_module.hpp index b6e775c170..172f2be48e 100644 --- a/ScannerBit/include/gambit/ScannerBit/py_module.hpp +++ b/ScannerBit/include/gambit/ScannerBit/py_module.hpp @@ -23,7 +23,6 @@ #include #include "gambit/Utils/begin_ignore_warnings_pybind11.hpp" -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include #include #include diff --git a/ScannerBit/include/gambit/ScannerBit/python_utils.hpp b/ScannerBit/include/gambit/ScannerBit/python_utils.hpp index 4cf1ea7309..f4068b2a7a 100644 --- a/ScannerBit/include/gambit/ScannerBit/python_utils.hpp +++ b/ScannerBit/include/gambit/ScannerBit/python_utils.hpp @@ -2,7 +2,6 @@ #define __SCAN_PYTHON_UTILS_HPP__ #include "gambit/Utils/begin_ignore_warnings_pybind11.hpp" -#include "gambit/Utils/begin_ignore_warnings_eigen.hpp" #include #include #include diff --git a/Utils/include/gambit/Utils/begin_ignore_warnings_eigen.hpp b/Utils/include/gambit/Utils/begin_ignore_warnings_eigen.hpp deleted file mode 100644 index 8a1a75ac6c..0000000000 --- a/Utils/include/gambit/Utils/begin_ignore_warnings_eigen.hpp +++ /dev/null @@ -1,51 +0,0 @@ -// GAMBIT: Global and Modular BSM Inference Tool -// ********************************************* -/// \file -/// -/// Pragma directives to suppress compiler warnings -/// coming from including Eigen library headers. -/// -/// ********************************************* -/// -/// Authors (add name and date if you modify): -/// -/// \author Anders Kvellestad -/// (anders.kvellestad@fys.uio.no) -/// \date 2021 Jul -/// -/// \author Tomas Gonzalo -/// (gonzalo@physik.rwth-aachen.de) -/// \date 2022 Apr -/// -/// ********************************************* - - -#include "gambit/cmake/cmake_variables.hpp" - -#ifdef SUPPRESS_LIBRARY_WARNINGS - - // GCC: - // clang also depfines __GNUC__ so make sure it is only GCC - #if defined(__GNUC__) && !defined(__clang__) - // Save diagnostic state - #pragma GCC diagnostic push - // Don't care if an old compiler version doesn't recognize all the pragmas - #pragma GCC diagnostic ignored "-Wpragmas" - // Turn off some warnings - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #pragma GCC diagnostic ignored "-Wdeprecated-copy" - #endif - - // Clang: - // icpc apparently also defines __clang__ - #if defined(__clang__) && !defined(__ICC) - // Save diagnostic state - #pragma clang diagnostic push - // Don't care if an old compiler version doesn't recognize all the pragmas - #pragma clang diagnostic ignored "-Wpragmas" - // Turn off some warnings - #pragma clang diagnostic ignored "-Wdeprecated-declarations" - #pragma clang diagnostic ignored "-Wdeprecated-copy" - #endif - -#endif