Merge pull request #271 from sy-c/master

v2.21.7

Author: sy-c

doc/releaseNotes.md

@@ -600,3 +600,6 @@ This file describes the main feature changes for each readout.exe released versi
 
 ## v2.21.6 - 09/11/2023
 - Minor changes: fix compilation warnings, FMQ API.
+
+## v2.21.7 - 24/11/2023
+- Minor changes: fix for c++20 compatibility.

src/ConsumerFMQchannel.cxx

@@ -55,7 +55,7 @@ struct DataBlockFMQStats {
   uint64_t dataSizeAccounted;
   uint64_t memorySizeAccounted;
 };
-static_assert(std::is_pod<DataBlockFMQStats>::value, "DataBlockFMQStats is not a POD");
+static_assert(std::is_trivially_copyable<DataBlockFMQStats>::value, "DataBlockFMQStats is not a POD");
 static_assert(sizeof(DataBlockFMQStats) <= DataBlockHeaderUserSpace, "DataBlockFMQStats does not fit in DataBlock.userSpace");
 
 #define timeNowMicrosec (std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now().time_since_epoch())).count

src/DataBlock.h

@@ -87,8 +87,8 @@ typedef struct {
 const DataBlock defaultDataBlock = { .header = defaultDataBlockHeader, .data = nullptr };
 
 // compile-time checks
-static_assert(std::is_pod<DataBlockHeader>::value, "DataBlockHeader is not a POD");
-static_assert(std::is_pod<DataBlock>::value, "DataBlock is not a POD");
+static_assert(std::is_trivially_copyable<DataBlockHeader>::value, "DataBlockHeader is not a POD");
+static_assert(std::is_trivially_copyable<DataBlock>::value, "DataBlock is not a POD");
 
 #endif /* READOUT_DATABLOCK */
 

src/ReadoutStats.h

@@ -60,7 +60,7 @@ struct ReadoutStatsCounters {
 const uint32_t ReadoutStatsCountersVersion = 0xA0000004;
 
 // need to be able to easily transmit this struct as a whole
-static_assert(std::is_pod<ReadoutStatsCounters>::value);
+static_assert(std::is_trivially_copyable<ReadoutStatsCounters>::value);
 
 // utility to assign strings to uint64
 uint64_t stringToUint64(const char*);

src/ReadoutUtils.cxx

@@ -267,6 +267,7 @@ int getStatsFilesystem(unsigned long long &freeBytes, const std::string &path) {
 }
 
 int numaBind(int numaNode) {
+ (void)numaNode;
   #ifdef WITH_NUMA
     struct bitmask* nodemask = nullptr;
     if (numaNode>=0) {
@@ -291,6 +292,8 @@ int numaBind(int numaNode) {
 }
 
 int numaGetNodeFromAddress(void *ptr, int &node) {
+  (void)ptr;
+  (void)node;
   #ifdef WITH_NUMA
     int err;
     node = -1;

src/ReadoutVersion.h

@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define READOUT_VERSION "2.21.6"
+#define READOUT_VERSION "2.21.7"
 

src/mainReadout.cxx

@@ -1215,6 +1215,7 @@ int Readout::_configure(const boost::property_tree::ptree& properties)
     // instanciate consumer of appropriate type
     std::unique_ptr<Consumer> newConsumer = nullptr;
     int cfgNumaNode = -1;
+    (void)cfgNumaNode;
     try {
       // configuration parameter: | consumer-* | consumerType | string |  | The type of consumer to be instanciated. One of:stats, FairMQDevice, DataSampling, FairMQChannel, fileRecorder, checker, processor, tcp. |
       std::string cfgType = "";