From 54b727f08a685606420703098131b387d3026637 Mon Sep 17 00:00:00 2001 From: tmadlener <thomas.madlener@desy.de> Date: Mon, 6 May 2024 11:06:54 +0200 Subject: [PATCH 1/2] Add missing list include to compile with gcc 12.3 --- GaudiKernel/include/GaudiKernel/DirSearchPath.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GaudiKernel/include/GaudiKernel/DirSearchPath.h b/GaudiKernel/include/GaudiKernel/DirSearchPath.h index 450bc5a51f..dae7a9b0a1 100644 --- a/GaudiKernel/include/GaudiKernel/DirSearchPath.h +++ b/GaudiKernel/include/GaudiKernel/DirSearchPath.h @@ -18,8 +18,10 @@ #include "boost/filesystem/exception.hpp" /*filesystem_error*/ #include "boost/filesystem/path.hpp" #include <functional> /* binary_function */ +#include <list> #include <string> #include <vector> + /** @class DirSearchPath * @brief search for files in a list of directories * @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration -- GitLab From 57cf6d7446fac5c13d33a5e869159eb88c2d02b3 Mon Sep 17 00:00:00 2001 From: tmadlener <thomas.madlener@desy.de> Date: Mon, 6 May 2024 11:18:16 +0200 Subject: [PATCH 2/2] Only include header if it exists --- GaudiKernel/src/Util/genconf.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/GaudiKernel/src/Util/genconf.cpp b/GaudiKernel/src/Util/genconf.cpp index d0bae498a9..072195a049 100644 --- a/GaudiKernel/src/Util/genconf.cpp +++ b/GaudiKernel/src/Util/genconf.cpp @@ -49,7 +49,10 @@ #include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/trim.hpp> -#include <boost/filesystem/convenience.hpp> +#include <boost/version.hpp> +#if BOOST_VERSION < 108500 +# include <boost/filesystem/convenience.hpp> +#endif #include <boost/filesystem/exception.hpp> #include <boost/filesystem/operations.hpp> #include <boost/log/core.hpp> -- GitLab