From b99975c12b5cf927ed3bb857fcdd11168e326ee2 Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Tue, 5 Dec 2023 13:38:43 +0000
Subject: [PATCH] Warning fixes in Ca, L1
---
algo/ca/TrackingDefs.h | 4 ++--
algo/ca/core/CMakeLists.txt | 6 ++++++
reco/L1/CMakeLists.txt | 4 ++--
reco/L1/CbmL1.h | 4 ++--
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/algo/ca/TrackingDefs.h b/algo/ca/TrackingDefs.h
index f9a1970d74..a20c95b9c4 100644
--- a/algo/ca/TrackingDefs.h
+++ b/algo/ca/TrackingDefs.h
@@ -21,7 +21,7 @@ namespace cbm::algo
}
namespace sts
{
- class Hit;
+ struct Hit;
}
namespace much
{
@@ -33,7 +33,7 @@ namespace cbm::algo
}
namespace tof
{
- class Hit;
+ struct Hit;
}
namespace ca
diff --git a/algo/ca/core/CMakeLists.txt b/algo/ca/core/CMakeLists.txt
index 3e2065b1c6..eb0d7c8d51 100644
--- a/algo/ca/core/CMakeLists.txt
+++ b/algo/ca/core/CMakeLists.txt
@@ -41,6 +41,12 @@ set(SRCS
SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS "-O3")
+If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ ADD_DEFINITIONS(-Wall -Wextra -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
+Else()
+ ADD_DEFINITIONS(-Wall -Wextra -Wsign-promo -Wno-pmf-conversions -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wstrict-null-sentinel -Wno-non-template-friend -Wno-parentheses -Wmissing-field-initializers) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
+EndIf()
+
add_library(CaCore SHARED ${SRCS})
target_include_directories(CaCore
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 773cd40127..5f69db7bb0 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -97,7 +97,7 @@ set(HEADERS
)
If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- ADD_DEFINITIONS(-Wall -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
+ ADD_DEFINITIONS(-Wall -Wextra -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
# -- - Check for compiler flags
CHECK_CXX_COMPILER_FLAG("-Werror -Wno-pmf-conversions" HAS_PMF)
@@ -118,7 +118,7 @@ If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
ADD_DEFINITIONS(-Wno-non-template-friend)
EndIf()
Else()
- ADD_DEFINITIONS(-Wall -Wsign-promo -Wno-pmf-conversions -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wstrict-null-sentinel -Wno-non-template-friend -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
+ ADD_DEFINITIONS(-Wall -Wextra -Wsign-promo -Wno-pmf-conversions -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wstrict-null-sentinel -Wno-non-template-friend -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
EndIf()
IF(SSE_FOUND)
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index 54bba0ff0c..1ee02e02c5 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -256,7 +256,7 @@ class CbmL1 : public FairTask {
void SetGlobalMode() { fTrackingMode = ca::Framework::TrackingMode::kGlobal; }
/// Sets misalignment of the detector
- void SetMisalignment(ca::EDetectorID det, float dx, float dy, float dt) { fvMisalignment[det] = {dx, dy, dt}; }
+ void SetMisalignment(ca::EDetectorID det, float dx, float dy, float dt) { fvMisalignment[det] = {{dx, dy, dt}}; }
void SetMisalignmentMvd(float dx, float dy, float dt) { SetMisalignment(ca::EDetectorID::kMvd, dx, dy, dt); }
void SetMisalignmentSts(float dx, float dy, float dt) { SetMisalignment(ca::EDetectorID::kSts, dx, dy, dt); }
@@ -474,7 +474,7 @@ class CbmL1 : public FairTask {
//std::unique_ptr<CbmCaMCModule> fpMCModule = nullptr; ///< MC-module for tracking
- cbm::ca::DetIdArr_t<std::array<float, 3>> fvMisalignment{{0.}}; ///< Misalignment
+ cbm::ca::DetIdArr_t<std::array<float, 3>> fvMisalignment{{{{{0.f, 0.f, 0.f}}}}}; ///< Misalignment
public:
// ** Basic data members **
--
GitLab