GPU: Workaround to keep the code compiled by AliRoot, be C++11 and CINT compatible

davidrohr · davidrohr · commit 1cf99d447ce4 · 2021-05-02T19:18:53.000+02:00
diff --git a/GPU/GPUTracking/Base/GPUParam.h b/GPU/GPUTracking/Base/GPUParam.h
@@ -21,7 +21,7 @@
 #include "GPUTPCGeometry.h"
 #include "GPUTPCGMPolynomialField.h"
 
-#ifndef GPUCA_GPUCODE
+#if !defined(GPUCA_GPUCODE) && defined(GPUCA_NOCOMPAT)
 namespace o2::base
 {
 template <typename>
@@ -63,7 +63,7 @@ struct GPUParam_t {
 };
 } // namespace internal
 
-#if !(defined(__CINT__) || defined(__ROOTCINT__)) || defined(__CLING__) // Hide from ROOT 5 CINT since it triggers a CINT but
+#if !(defined(__CINT__) || defined(__ROOTCINT__)) || defined(__CLING__) // Hide from ROOT 5 CINT
 MEM_CLASS_PRE()
 struct GPUParam : public internal::GPUParam_t<GPUSettingsRec, GPUSettingsParam> {
 
diff --git a/GPU/GPUTracking/DataTypes/GPUDataTypes.h b/GPU/GPUTracking/DataTypes/GPUDataTypes.h
@@ -49,7 +49,7 @@ namespace o2
 class MCCompLabel;
 namespace base
 {
-template <typename>
+template <typename T>
 class PropagatorImpl;
 class MatLayerCylSet;
 } // namespace base
diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTrackerKernels.cxx b/GPU/GPUTracking/TRDTracking/GPUTRDTrackerKernels.cxx
@@ -20,17 +20,26 @@
 
 using namespace GPUCA_NAMESPACE::gpu;
 
+#ifdef HAVE_O2HEADERS
+template <int I>
+GPUd() auto& getTracker(GPUTRDTrackerKernels::processorType& processors);
 template <>
-GPUdi() auto& GPUTRDTrackerKernels::getTracker<0>(processorType& processors)
+GPUdi() auto& getTracker<0>(GPUTRDTrackerKernels::processorType& processors)
 {
   return processors.trdTrackerGPU;
 }
-
 template <>
-GPUdi() auto& GPUTRDTrackerKernels::getTracker<1>(processorType& processors)
+GPUdi() auto& getTracker<1>(GPUTRDTrackerKernels::processorType& processors)
 {
   return processors.trdTrackerO2;
 }
+#else
+template <int I>
+GPUdi() GPUTRDTrackerGPU& getTracker(GPUTRDTrackerKernels::processorType& processors)
+{
+  return processors.trdTrackerGPU;
+}
+#endif
 
 template <int I>
 GPUdii() void GPUTRDTrackerKernels::Thread(int nBlocks, int nThreads, int iBlock, int iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors)
@@ -43,4 +52,6 @@ GPUdii() void GPUTRDTrackerKernels::Thread(int nBlocks, int nThreads, int iBlock
 }
 
 template GPUd() void GPUTRDTrackerKernels::Thread<0>(int nBlocks, int nThreads, int iBlock, int iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors);
+#ifdef HAVE_O2HEADERS
 template GPUd() void GPUTRDTrackerKernels::Thread<1>(int nBlocks, int nThreads, int iBlock, int iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors);
+#endif
diff --git a/GPU/GPUTracking/TRDTracking/GPUTRDTrackerKernels.h b/GPU/GPUTracking/TRDTracking/GPUTRDTrackerKernels.h
@@ -27,10 +27,6 @@ class GPUTRDTrackerKernels : public GPUKernelTemplate
   GPUhdi() CONSTEXPR static GPUDataTypes::RecoStep GetRecoStep() { return GPUCA_RECO_STEP::TRDTracking; }
   template <int iKernel = defaultKernel>
   GPUd() static void Thread(int nBlocks, int nThreads, int iBlock, int iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors);
-
- private:
-  template <int I>
-  GPUd() static auto& getTracker(processorType& processors);
 };
 } // namespace gpu
 } // namespace GPUCA_NAMESPACE
diff --git a/GPU/GPUTracking/utils/strtag.h b/GPU/GPUTracking/utils/strtag.h
@@ -18,7 +18,10 @@
 #include <string>
 
 template <class T = unsigned long>
-constexpr T qStr2Tag(const char* str)
+#if defined(__cplusplus) && __cplusplus >= 201402L
+constexpr
+#endif
+T qStr2Tag(const char* str)
 {
   if (strlen(str) != sizeof(T)) {
     throw std::runtime_error("Invalid tag length");

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ namespace o2`
`49`	`49`	`class MCCompLabel;`
`50`	`50`	`namespace base`
`51`	`51`	`{`
`52`		`-template <typename>`
	`52`	`+template <typename T>`
`53`	`53`	`class PropagatorImpl;`
`54`	`54`	`class MatLayerCylSet;`
`55`	`55`	`} // namespace base`