Misc fixes for C++20 / new fmt (AliceO2Group#3863)

* Fix for fmt 10.1.1 * Drop obsolete flag * Fix warning * Fix missing namespace
creetz16 · Nov 15, 2023 · f064acd · f064acd
1 parent af410a0
commit f064acd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ALICE3/Core/DelphesO2TrackSmearer.h b/ALICE3/Core/DelphesO2TrackSmearer.h
@@ -129,8 +129,8 @@ struct lutEntry_t {
   float otof = 0.;
   float covm[15] = {0.};
   float eigval[5] = {0.};
-  float eigvec[5][5] = {0.};
-  float eiginv[5][5] = {0.};
+  float eigvec[5][5] = {{0.}};
+  float eiginv[5][5] = {{0.}};
   void print()
   {
     printf(" --- lutEntry: pt = %f, eta = %f (%s)\n", pt, eta, valid ? "valid" : "not valid");

diff --git a/DPG/Tasks/AOTTrack/qaMatchEff.cxx b/DPG/Tasks/AOTTrack/qaMatchEff.cxx
@@ -54,7 +54,8 @@ using namespace o2::framework;
 using namespace o2::framework::expressions;
 using std::array;
 using namespace extConfPar;
-//
+using o2::constants::math::PI;
+using o2::constants::math::TwoPI;
 //
 struct qaMatchEff {
   int lastRunNumber = -1;

diff --git a/PWGCF/Core/CorrelationContainer.cxx b/PWGCF/Core/CorrelationContainer.cxx
@@ -520,7 +520,7 @@ TH2* CorrelationContainer::getSumOfRatios(CorrelationContainer* mixed, Correlati
   // If step6 is not available we fallback to taking the normalization along all delta phi (WARNING requires a
   // flat delta phi distribution)
   if (stepForMixed == -1 && step == kCFStepBiasStudy && mixed->mTriggerHist->getTHn(kCFStepReconstructed)->GetEntries() > 0 && !mSkipScaleMixedEvent) {
-    LOGF(info, "Using mixed-event normalization factors from step %d", kCFStepReconstructed);
+    LOGF(info, "Using mixed-event normalization factors from step %d", (int)kCFStepReconstructed);
     mixed->getHistsZVtxMult(kCFStepReconstructed, ptTriggerMin, ptTriggerMax, &trackMixedAllStep6, &eventMixedAllStep6);
   }
 

diff --git a/dependencies/O2PhysicsCompileFlags.cmake b/dependencies/O2PhysicsCompileFlags.cmake
@@ -53,7 +53,6 @@ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "Debug mode buil
 set(CMAKE_Fortran_FLAGS_DEBUG "-g -O0" CACHE STRING "Debug mode build flags" FORCE)
 
 if(APPLE)
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,error") # avoid undefined in our libs
 elseif(UNIX)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") # avoid undefined in our libs
 endif()