Skip to content

Commit 434d782

Browse files
Dario Berzanodberzano
authored andcommitted
Move constexpr to headers
Fixes stricter C++17 criteria causing build errors
1 parent 9c4b1d5 commit 434d782

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

DataFormats/Detectors/TPC/include/DataFormatsTPC/TPCSectorHeader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace TPC
2323
/// TPC specific header to be transported on the header stack
2424
struct TPCSectorHeader : public o2::header::BaseHeader {
2525
// Required to do the lookup
26-
static const o2::header::HeaderType sHeaderType;
26+
constexpr static const o2::header::HeaderType sHeaderType = "TPCSectH";
2727
static const uint32_t sVersion = 1;
2828

2929
TPCSectorHeader(int s)

DataFormats/Detectors/TPC/src/TPCSectorHeader.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010

1111
#include "DataFormatsTPC/TPCSectorHeader.h"
1212

13-
constexpr o2::header::HeaderType o2::TPC::TPCSectorHeader::sHeaderType = "TPCSectH";
13+
constexpr o2::header::HeaderType o2::TPC::TPCSectorHeader::sHeaderType;

Framework/Core/include/Framework/DataProcessingHeader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace framework
4444
struct DataProcessingHeader : public header::BaseHeader
4545
{
4646
// Required to do the lookup
47-
static const o2::header::HeaderType sHeaderType;
47+
constexpr static const o2::header::HeaderType sHeaderType = "DataFlow";
4848
static const uint32_t sVersion = 1;
4949

5050
// allows DataHeader::SubSpecificationType to be used as generic type in the code

Framework/Core/src/DataProcessingHeader.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace o2
1616
namespace framework
1717
{
1818

19-
constexpr o2::header::HeaderType DataProcessingHeader::sHeaderType = "DataFlow";
19+
constexpr o2::header::HeaderType DataProcessingHeader::sHeaderType;
2020

2121
} // namespace framework
2222
} // namespace o2

0 commit comments

Comments
 (0)