Skip to content
Snippets Groups Projects
Commit 1008a184 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by Wouter Deconinck
Browse files

fix build on macOS

parent 6cff4fd3
No related branches found
No related tags found
1 merge request!363fix build on macOS
Pipeline #71807 failed
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "DDRec/DetectorData.h" #include "DDRec/DetectorData.h"
#include "DDRec/Surface.h" #include "DDRec/Surface.h"
#include "XML/Layering.h" #include "XML/Layering.h"
#include <array>
using namespace std; using namespace std;
using namespace dd4hep; using namespace dd4hep;
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "DDRec/DetectorData.h" #include "DDRec/DetectorData.h"
#include "XML/Layering.h" #include "XML/Layering.h"
#include "XML/Utilities.h" #include "XML/Utilities.h"
#include <array>
#if defined(USE_ACTSDD4HEP) #if defined(USE_ACTSDD4HEP)
#include "ActsDD4hep/ActsExtension.hpp" #include "ActsDD4hep/ActsExtension.hpp"
......
...@@ -195,7 +195,7 @@ static Ref_t create_field_map_brbz(Detector & /*lcdd*/, xml::Handle_t handle) ...@@ -195,7 +195,7 @@ static Ref_t create_field_map_brbz(Detector & /*lcdd*/, xml::Handle_t handle)
if( !fs::exists(fs::path(field_map_file)) ) { if( !fs::exists(fs::path(field_map_file)) ) {
printout(ERROR, "FieldMapBrBz", "file " + field_map_file + " does not exist"); printout(ERROR, "FieldMapBrBz", "file " + field_map_file + " does not exist");
printout(ERROR, "FieldMapBrBz", "use a FileLoader plugin before the field element"); printout(ERROR, "FieldMapBrBz", "use a FileLoader plugin before the field element");
std::quick_exit(1); std::_Exit(EXIT_FAILURE);
} }
auto map = new FieldMapBrBz(field_type); auto map = new FieldMapBrBz(field_type);
......
...@@ -54,7 +54,7 @@ EnsureFileFromURLExists( ...@@ -54,7 +54,7 @@ EnsureFileFromURLExists(
if (fs::create_directories(parent_path) == false) { if (fs::create_directories(parent_path) == false) {
printout(ERROR, "FileLoader", "parent path " + parent_path.string() + " cannot be created"); printout(ERROR, "FileLoader", "parent path " + parent_path.string() + " cannot be created");
printout(ERROR, "FileLoader", "check permissions and retry"); printout(ERROR, "FileLoader", "check permissions and retry");
std::quick_exit(1); std::_Exit(EXIT_FAILURE);
} }
} }
...@@ -85,7 +85,7 @@ EnsureFileFromURLExists( ...@@ -85,7 +85,7 @@ EnsureFileFromURLExists(
} catch (const fs::filesystem_error&) { } catch (const fs::filesystem_error&) {
printout(ERROR, "FileLoader", "unable to link from " + hash_path.string() + " to " + cache_hash_path.string()); printout(ERROR, "FileLoader", "unable to link from " + hash_path.string() + " to " + cache_hash_path.string());
printout(ERROR, "FileLoader", "check permissions and retry"); printout(ERROR, "FileLoader", "check permissions and retry");
std::quick_exit(1); std::_Exit(EXIT_FAILURE);
} }
break; break;
} }
...@@ -103,7 +103,7 @@ EnsureFileFromURLExists( ...@@ -103,7 +103,7 @@ EnsureFileFromURLExists(
printout(ERROR, "FileLoader", "unable to run cmd " + cmd); printout(ERROR, "FileLoader", "unable to run cmd " + cmd);
printout(ERROR, "FileLoader", "check command and retry"); printout(ERROR, "FileLoader", "check command and retry");
printout(ERROR, "FileLoader", "hint: allow insecure connections with -k"); printout(ERROR, "FileLoader", "hint: allow insecure connections with -k");
std::quick_exit(1); std::_Exit(EXIT_FAILURE);
} }
} }
...@@ -120,14 +120,14 @@ EnsureFileFromURLExists( ...@@ -120,14 +120,14 @@ EnsureFileFromURLExists(
if (fs::remove(file_path) == false) { if (fs::remove(file_path) == false) {
printout(ERROR, "FileLoader", "unable to remove symlink " + file_path.string()); printout(ERROR, "FileLoader", "unable to remove symlink " + file_path.string());
printout(ERROR, "FileLoader", "check permissions or remove manually"); printout(ERROR, "FileLoader", "check permissions or remove manually");
std::quick_exit(1); std::_Exit(EXIT_FAILURE);
} }
} }
} else { } else {
// file exists but not symlink // file exists but not symlink
printout(ERROR, "FileLoader", "will not remove actual file " + file_path.string()); printout(ERROR, "FileLoader", "will not remove actual file " + file_path.string());
printout(ERROR, "FileLoader", "check content, remove manually, and retry"); printout(ERROR, "FileLoader", "check content, remove manually, and retry");
std::quick_exit(1); std::_Exit(EXIT_FAILURE);
} }
} }
// file_path now does not exist // file_path now does not exist
...@@ -139,6 +139,6 @@ EnsureFileFromURLExists( ...@@ -139,6 +139,6 @@ EnsureFileFromURLExists(
} catch (const fs::filesystem_error&) { } catch (const fs::filesystem_error&) {
printout(ERROR, "FileLoader", "unable to link from " + file_path.string() + " to " + hash_path.string()); printout(ERROR, "FileLoader", "unable to link from " + file_path.string() + " to " + hash_path.string());
printout(ERROR, "FileLoader", "check permissions and retry"); printout(ERROR, "FileLoader", "check permissions and retry");
std::quick_exit(1); std::_Exit(EXIT_FAILURE);
} }
} }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
* *
* @{ * @{
*/ */
#include <array>
#include <map> #include <map>
#include "DD4hep/DetFactoryHelper.h" #include "DD4hep/DetFactoryHelper.h"
#include "DD4hep/Printout.h" #include "DD4hep/Printout.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment