GPU: Remove all C++11 based protections

Author: davidrohr

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

@@ -49,9 +49,9 @@ class CalibdEdxCorrection
   }
   CalibdEdxCorrection(std::string_view fileName) { loadFromFile(fileName); }
 #else
-  CalibdEdxCorrection() CON_DEFAULT;
+  CalibdEdxCorrection() = default;
 #endif
-  ~CalibdEdxCorrection() CON_DEFAULT;
+  ~CalibdEdxCorrection() = default;
 
   GPUd() float getCorrection(const StackID& stack, ChargeType charge, float tgl = 0, float snp = 0) const
   {

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

@@ -76,7 +76,7 @@ struct ClusterNative {
   GPUd() static float unpackPad(uint16_t pad) { return float(pad) * (1.f / scalePadPacked); }
   GPUd() static float unpackTime(uint32_t time) { return float(time) * (1.f / scaleTimePacked); }
 
-  GPUdDefault() ClusterNative() CON_DEFAULT;
+  GPUdDefault() ClusterNative() = default;
   GPUd() ClusterNative(uint32_t time, uint8_t flags, uint16_t pad, uint8_t sigmaTime, uint8_t sigmaPad, uint16_t qmax, uint16_t qtot) : padPacked(pad), sigmaTimePacked(sigmaTime), sigmaPadPacked(sigmaPad), qMax(qmax), qTot(qtot)
   {
     setTimePackedFlags(time, flags);

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

@@ -77,8 +77,8 @@ struct CompressedClustersOffsets : public CompressedClustersPtrs_x<size_t, size_
 struct CompressedClustersFlat;
 
 struct CompressedClusters : public CompressedClustersCounters, public CompressedClustersPtrs { // TODO: Need a const version of this, currently the constructor allows to create a non-const version from const CompressedClustersFlat, which should not be allowed
-  CompressedClusters() CON_DEFAULT;
-  ~CompressedClusters() CON_DEFAULT;
+  CompressedClusters() = default;
+  ~CompressedClusters() = default;
   CompressedClusters(const CompressedClustersFlat& c);
 
   void dump();
@@ -87,7 +87,7 @@ struct CompressedClusters : public CompressedClustersCounters, public Compressed
 };
 
 struct CompressedClustersROOT : public CompressedClusters {
-  CompressedClustersROOT() CON_DEFAULT;
+  CompressedClustersROOT() = default;
   CompressedClustersROOT(const CompressedClustersFlat& v) : CompressedClusters(v) {}
   CompressedClustersROOT(const CompressedClusters& v) : CompressedClusters(v) {}
   // flatbuffer used for streaming
@@ -99,7 +99,7 @@ struct CompressedClustersROOT : public CompressedClusters {
 
 struct CompressedClustersFlat : private CompressedClustersCounters, private CompressedClustersOffsets {
   friend struct CompressedClusters;               // We don't want anyone to access the members directly, should only be used to construct a CompressedClusters struct
-  CompressedClustersFlat() CON_DELETE;            // Must not be constructed
+  CompressedClustersFlat() = delete;              // Must not be constructed
   size_t totalDataSize = 0;                       // Total data size of header + content
   const CompressedClusters* ptrForward = nullptr; // Must be 0 if this object is really flat, or can be a ptr to a CompressedClusters struct (abusing the flat structure to forward a ptr to the e.g. root version)
 

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

@@ -36,7 +36,7 @@ class Digit : public DigitBase
 {
  public:
   /// Default constructor
-  GPUdDefault() Digit() CON_DEFAULT;
+  GPUdDefault() Digit() = default;
 
   /// Constructor, initializing values for position, charge, time and common mode
   /// \param cru CRU of the Digit
@@ -46,7 +46,7 @@ class Digit : public DigitBase
   GPUdi() Digit(int cru, float charge, int row, int pad, int time);
 
   /// Destructor
-  GPUdDefault() ~Digit() CON_DEFAULT;
+  GPUdDefault() ~Digit() = default;
 
   /// Get the accumulated charged of the Digit in ADC counts.
   /// The conversion is such that the decimals are simply stripped

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

@@ -39,10 +39,10 @@ class PIDResponse
 {
  public:
   /// default constructor
-  PIDResponse() CON_DEFAULT;
+  PIDResponse() = default;
 
   /// default destructor
-  ~PIDResponse() CON_DEFAULT;
+  ~PIDResponse() = default;
 
   /// setters
   GPUd() void setBetheBlochParams(const float betheBlochParams[5]);

DataFormats/common/include/CommonDataFormat/TimeStamp.h

@@ -25,8 +25,8 @@ template <typename T>
 class TimeStamp
 {
  public:
-  GPUhdDefault() TimeStamp() CON_DEFAULT;
-  GPUhdDefault() ~TimeStamp() CON_DEFAULT;
+  GPUhdDefault() TimeStamp() = default;
+  GPUhdDefault() ~TimeStamp() = default;
   GPUdi() TimeStamp(T time) { mTimeStamp = time; }
   GPUhdi() T getTimeStamp() const { return mTimeStamp; }
   GPUdi() void setTimeStamp(T t) { mTimeStamp = t; }

Detectors/Base/include/DetectorsBase/MatCell.h

@@ -31,7 +31,7 @@ struct MatCell {
   float meanX2X0;                   ///< fraction of radiaton lenght
 
   GPUd() MatCell() : meanRho(0.f), meanX2X0(0.f) {}
-  GPUdDefault() MatCell(const MatCell& src) CON_DEFAULT;
+  GPUdDefault() MatCell(const MatCell& src) = default;
 
   GPUd() void set(const MatCell& c)
   {
@@ -55,7 +55,7 @@ struct MatBudget : MatCell {
   float length;                     ///< length in material
 
   GPUd() MatBudget() : length(0.f) {}
-  GPUdDefault() MatBudget(const MatBudget& src) CON_DEFAULT;
+  GPUdDefault() MatBudget(const MatBudget& src) = default;
 
   GPUd() void scale(float scale)
   {

Detectors/Base/include/DetectorsBase/MatLayerCyl.h

@@ -56,8 +56,8 @@ class MatLayerCyl : public o2::gpu::FlatObject
 
 #ifndef GPUCA_GPUCODE
   MatLayerCyl();
-  MatLayerCyl(const MatLayerCyl& src) CON_DELETE;
-  ~MatLayerCyl() CON_DEFAULT;
+  MatLayerCyl(const MatLayerCyl& src) = delete;
+  ~MatLayerCyl() = default;
 #endif
 
 #ifndef GPUCA_ALIGPUCODE // this part is unvisible on GPU version

Detectors/Base/include/DetectorsBase/MatLayerCylSet.h

@@ -52,9 +52,9 @@ class MatLayerCylSet : public o2::gpu::FlatObject
 
  public:
 #ifndef GPUCA_GPUCODE
-  MatLayerCylSet() CON_DEFAULT;
-  ~MatLayerCylSet() CON_DEFAULT;
-  MatLayerCylSet(const MatLayerCylSet& src) CON_DELETE;
+  MatLayerCylSet() = default;
+  ~MatLayerCylSet() = default;
+  MatLayerCylSet(const MatLayerCylSet& src) = delete;
 #endif
 
   GPUd() const MatLayerCylSetLayout* get() const { return reinterpret_cast<const MatLayerCylSetLayout*>(mFlatBufferPtr); }

Detectors/Base/include/DetectorsBase/Ray.h

@@ -49,7 +49,7 @@ class Ray
   GPUd() Ray() : mP{0.f}, mD{0.f}, mDistXY2(0.f), mDistXY2i(0.f), mDistXYZ(0.f), mXDxPlusYDy(0.f), mXDxPlusYDyRed(0.f), mXDxPlusYDy2(0.f), mR02(0.f), mR12(0.f)
   {
   }
-  GPUdDefault() ~Ray() CON_DEFAULT;
+  GPUdDefault() ~Ray() = default;
 
 #ifndef GPUCA_ALIGPUCODE // this part is unvisible on GPU version
   Ray(const math_utils::Point3D<float> point0, const math_utils::Point3D<float> point1);