Skip to content

Commit 69deda2

Browse files
committed
changed is_pod
1 parent 87f88eb commit 69deda2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/ConsumerFMQchannel.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct DataBlockFMQStats {
5555
uint64_t dataSizeAccounted;
5656
uint64_t memorySizeAccounted;
5757
};
58-
static_assert(std::is_pod<DataBlockFMQStats>::value, "DataBlockFMQStats is not a POD");
58+
static_assert(std::is_trivially_copyable<DataBlockFMQStats>::value, "DataBlockFMQStats is not a POD");
5959
static_assert(sizeof(DataBlockFMQStats) <= DataBlockHeaderUserSpace, "DataBlockFMQStats does not fit in DataBlock.userSpace");
6060

6161
#define timeNowMicrosec (std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now().time_since_epoch())).count

src/DataBlock.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ typedef struct {
8787
const DataBlock defaultDataBlock = { .header = defaultDataBlockHeader, .data = nullptr };
8888

8989
// compile-time checks
90-
static_assert(std::is_pod<DataBlockHeader>::value, "DataBlockHeader is not a POD");
91-
static_assert(std::is_pod<DataBlock>::value, "DataBlock is not a POD");
90+
static_assert(std::is_trivially_copyable<DataBlockHeader>::value, "DataBlockHeader is not a POD");
91+
static_assert(std::is_trivially_copyable<DataBlock>::value, "DataBlock is not a POD");
9292

9393
#endif /* READOUT_DATABLOCK */
9494

src/ReadoutStats.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct ReadoutStatsCounters {
6060
const uint32_t ReadoutStatsCountersVersion = 0xA0000004;
6161

6262
// need to be able to easily transmit this struct as a whole
63-
static_assert(std::is_pod<ReadoutStatsCounters>::value);
63+
static_assert(std::is_trivially_copyable<ReadoutStatsCounters>::value);
6464

6565
// utility to assign strings to uint64
6666
uint64_t stringToUint64(const char*);

0 commit comments

Comments
 (0)