C++20 disables aggregate initialisation if default constructors found

ktf · Nov 7, 2023 · ec28150 · ec28150
1 parent 07342ad
commit ec28150
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 10 deletions.
diff --git a/DataFormats/Detectors/CTP/include/DataFormatsCTP/Digits.h b/DataFormats/Detectors/CTP/include/DataFormatsCTP/Digits.h
@@ -51,7 +51,6 @@ struct CTPDigit {
   o2::InteractionRecord intRecord;
   std::bitset<CTP_NINPUTS> CTPInputMask;
   std::bitset<CTP_NCLASSES> CTPClassMask;
-  CTPDigit() = default;
   void printStream(std::ostream& stream) const;
   void setInputMask(gbtword80_t mask);
   void setClassMask(gbtword80_t mask);
@@ -72,7 +71,6 @@ struct CTPInputDigit {
   o2::InteractionRecord intRecord;
   std::bitset<CTP_MAXTRIGINPPERDET> inputsMask;
   o2::detectors::DetID::ID detector;
-  CTPInputDigit() = default;
   ClassDefNV(CTPInputDigit, 1)
 };
 } // namespace ctp

diff --git a/DataFormats/Detectors/CTP/include/DataFormatsCTP/LumiInfo.h b/DataFormats/Detectors/CTP/include/DataFormatsCTP/LumiInfo.h
@@ -22,7 +22,6 @@ namespace o2
 namespace ctp
 {
 struct LumiInfo {
-  LumiInfo() = default;
   uint32_t orbit = 0;       // orbit of TF when was updated
   uint32_t nHBFCounted = 0; // length of interval in HB
   uint32_t nHBFCountedFV0 = 0;

diff --git a/Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/Clusterer.h b/Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/Clusterer.h
@@ -118,7 +118,6 @@ class Clusterer
     uint32_t firstPatt = 0;
     uint32_t nClus = 0;
     uint32_t nPatt = 0;
-    ThreadStat() = default;
   };
 
   struct ClustererThread {

diff --git a/Detectors/Upgrades/ITS3/reconstruction/include/ITS3Reconstruction/Clusterer.h b/Detectors/Upgrades/ITS3/reconstruction/include/ITS3Reconstruction/Clusterer.h
@@ -118,7 +118,6 @@ class Clusterer
     uint32_t firstPatt = 0;
     uint32_t nClus = 0;
     uint32_t nPatt = 0;
-    ThreadStat() = default;
   };
 
   struct ClustererThread {

diff --git a/Framework/Core/include/Framework/DeviceSpec.h b/Framework/Core/include/Framework/DeviceSpec.h
@@ -46,13 +46,11 @@ namespace o2::framework
 ///
 /// auto &deviceSpec = ctx.services().get<DeviceSpec const>();
 struct DeviceSpec {
-  DeviceSpec(const DeviceSpec&) = delete;
-  DeviceSpec(DeviceSpec&&) = default;
   /// The name of the associated DataProcessorSpec
-  std::string name;
+  std::string name = "unknown";
   /// The id of the device, including time-pipelining and suffix
-  std::string id;
-  std::string channelPrefix;
+  std::string id = "unknown";
+  std::string channelPrefix = "";
   std::vector<InputChannelSpec> inputChannels;
   std::vector<OutputChannelSpec> outputChannels;
   std::vector<std::string> arguments;

diff --git a/Framework/Core/src/DeviceSpecHelpers.cxx b/Framework/Core/src/DeviceSpecHelpers.cxx
@@ -534,6 +534,7 @@ void DeviceSpecHelpers::processOutEdgeActions(ConfigContext const& configContext
       .name = processor.name,
       .id = processor.maxInputTimeslices == 1 ? processor.name : processor.name + "_t" + std::to_string(edge.producerTimeIndex),
       .channelPrefix = channelPrefix,
+      .inputChannels = {},
       .options = processor.options,
       .services = ServiceSpecHelpers::filterDisabled(processor.requiredServices, overrideServices),
       .algorithm = processor.algorithm,