From 617f9a0756aa6221a7fe87c187fc5143a768337e Mon Sep 17 00:00:00 2001
From: Vincenzo Innocente <vincenzo.innocente@cern.ch>
Date: Mon, 28 Oct 2019 00:45:14 +0100
Subject: [PATCH] fix clang compilation error and gcc warnings (#388)

---
 HeterogeneousCore/CUDAUtilities/interface/prefixScan.h  | 4 ++--
 HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HeterogeneousCore/CUDAUtilities/interface/prefixScan.h b/HeterogeneousCore/CUDAUtilities/interface/prefixScan.h
index 20bea6ecb6f7a..9e591f2be4d69 100644
--- a/HeterogeneousCore/CUDAUtilities/interface/prefixScan.h
+++ b/HeterogeneousCore/CUDAUtilities/interface/prefixScan.h
@@ -139,7 +139,7 @@ __global__ void multiBlockPrefixScan(T const* __restrict__ ci, T* __restrict__ c
   __shared__ bool isLastBlockDone;
   if (0 == threadIdx.x) {
     auto value = atomicAdd(pc, 1);  // block counter
-    isLastBlockDone = (value == (gridDim.x - 1));
+    isLastBlockDone = (value == (int(gridDim.x) - 1));
   }
 
   __syncthreads();
@@ -151,7 +151,7 @@ __global__ void multiBlockPrefixScan(T const* __restrict__ ci, T* __restrict__ c
 
   // let's get the partial sums from each block
   __shared__ T psum[1024];
-  for (int i = threadIdx.x; i < gridDim.x; i += blockDim.x) {
+  for (int i = threadIdx.x, ni = gridDim.x; i<ni; i += blockDim.x) {
     auto j = 1024 * i + 1023;
     psum[i] = (j < size) ? co[j] : T(0);
   }
diff --git a/HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h b/HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h
index b2d85cf1cf732..75763952d782b 100644
--- a/HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h
+++ b/HeterogeneousCore/CUDAUtilities/test/OneToManyAssoc_t.h
@@ -221,7 +221,7 @@ int main() {
 
   // now the inverse map (actually this is the direct....)
   AtomicPairCounter* dc_d;
-  AtomicPairCounter dc;
+  AtomicPairCounter dc(0);
 
 #ifdef __CUDACC__
   cudaMalloc(&dc_d, sizeof(AtomicPairCounter));
@@ -246,7 +246,7 @@ int main() {
   verifyBulk(a_d.get(), dc_d);
   memcpy(&la, a_d.get(), sizeof(Assoc));
 
-  AtomicPairCounter sdc;
+  AtomicPairCounter sdc(0);
   fillBulk(&sdc, v_d, sa_d.get(), N);
   cudautils::finalizeBulk(&sdc, sa_d.get());
   verifyBulk(sa_d.get(), &sdc);