From a5bb863d9dd2f31c4652d16d507fda9e55ef9012 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 1 Apr 2024 13:23:21 +0200 Subject: [PATCH] Compile on MacOS by adding ARM64 to Xdr.cc and removing binary_function (binary_function has been removed in C++17) --- source/src/DBInterface.cc | 3 +-- source/src/Xdr.cc | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/src/DBInterface.cc b/source/src/DBInterface.cc index 70fce34..4897ff1 100644 --- a/source/src/DBInterface.cc +++ b/source/src/DBInterface.cc @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -39,7 +38,7 @@ namespace lccd { /** Helper class to sort collections of conditions data w.r.t. to their validity time intervall */ - struct less_wrt_validity : public binary_function{ + struct less_wrt_validity { bool operator() (lcio::LCCollection* c0, lcio::LCCollection* c1) const { return ( std::atoll( c0->parameters().getStringVal(lccd::DBSINCE).c_str() ) < std::atoll( c1->parameters().getStringVal(lccd::DBSINCE).c_str() ) ) ; diff --git a/source/src/Xdr.cc b/source/src/Xdr.cc index 5e9ce1b..ffe28a0 100644 --- a/source/src/Xdr.cc +++ b/source/src/Xdr.cc @@ -2,15 +2,13 @@ #include"lccd/Xdr.hh" -#include - namespace lccd{ //------------------------------------------ // Code copied from SIO_functions. //------------------------------------------ -#if defined(__alpha__) || defined(__i386__) || defined(_M_ALPHA) || defined(_M_IX86) || defined(__x86_64__) +#if defined(__alpha__) || defined(__i386__) || defined(_M_ALPHA) || defined(_M_IX86) || defined(__x86_64__) || defined(__aarch64__) #define XDR_LITTLE_ENDIAN #endif