GPU: Fix HIP compiler warnings

davidrohr · davidrohr · commit 318521ba75bf · 2020-02-18T10:15:24.000+01:00
diff --git a/GPU/GPUTracking/Base/GPUReconstructionConvert.cxx b/GPU/GPUTracking/Base/GPUReconstructionConvert.cxx
@@ -45,21 +45,21 @@ void GPUReconstructionConvert::ConvertNativeToClusterData(o2::tpc::ClusterNative
     nClSlice = 0;
     for (int j = 0; j < GPUCA_ROW_COUNT; j++) {
       for (unsigned int k = 0; k < native->nClusters[i][j]; k++) {
-        const auto& cin = native->clusters[i][j][k];
+        const auto& clin = native->clusters[i][j][k];
         float x = 0, y = 0, z = 0;
         if (continuousMaxTimeBin == 0) {
-          transform->Transform(i, j, cin.getPad(), cin.getTime(), x, y, z);
+          transform->Transform(i, j, clin.getPad(), clin.getTime(), x, y, z);
         } else {
-          transform->TransformInTimeFrame(i, j, cin.getPad(), cin.getTime(), x, y, z, continuousMaxTimeBin);
+          transform->TransformInTimeFrame(i, j, clin.getPad(), clin.getTime(), x, y, z, continuousMaxTimeBin);
         }
-        auto& cout = clusters[i].get()[nClSlice];
-        cout.x = x;
-        cout.y = y;
-        cout.z = z;
-        cout.row = j;
-        cout.amp = cin.qTot;
-        cout.flags = cin.getFlags();
-        cout.id = offset + k;
+        auto& clout = clusters[i].get()[nClSlice];
+        clout.x = x;
+        clout.y = y;
+        clout.z = z;
+        clout.row = j;
+        clout.amp = clin.qTot;
+        clout.flags = clin.getFlags();
+        clout.id = offset + k;
         nClSlice++;
       }
       native->clusterOffset[i][j] = offset;
diff --git a/GPU/GPUTracking/TPCConvert/GPUTPCConvertKernel.cxx b/GPU/GPUTracking/TPCConvert/GPUTPCConvertKernel.cxx
@@ -32,20 +32,20 @@ GPUd() void GPUTPCConvertKernel::Thread<0>(int nBlocks, int nThreads, int iBlock
   const int indexOffset = native->clusterOffset[iSlice][iRow] - native->clusterOffset[iSlice][0];
 
   for (unsigned int k = get_local_id(0); k < native->nClusters[iSlice][iRow]; k += get_local_size(0)) {
-    const auto& cin = native->clusters[iSlice][iRow][k];
+    const auto& clin = native->clusters[iSlice][iRow][k];
     float x, y, z;
-    GPUTPCConvertImpl::convert(processors, iSlice, iRow, cin.getPad(), cin.getTime(), x, y, z);
-    auto& cout = clusters[indexOffset + k];
-    cout.x = x;
-    cout.y = y;
-    cout.z = z;
-    cout.row = iRow;
-    cout.amp = cin.qTot;
-    cout.flags = cin.getFlags();
-    cout.id = idOffset + k;
+    GPUTPCConvertImpl::convert(processors, iSlice, iRow, clin.getPad(), clin.getTime(), x, y, z);
+    auto& clout = clusters[indexOffset + k];
+    clout.x = x;
+    clout.y = y;
+    clout.z = z;
+    clout.row = iRow;
+    clout.amp = clin.qTot;
+    clout.flags = clin.getFlags();
+    clout.id = idOffset + k;
 #ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME
-    cout.pad = cin.getPad();
-    cout.time = cin.getTime();
+    clout.pad = clin.getPad();
+    clout.time = clin.getTime();
 #endif
   }
 }
