Fix compilation errors under GCC 8 (cms-sw#314)

fwyzard · Apr 8, 2019 · ccb7761 · ccb7761
1 parent 586c0c0
commit ccb7761
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cpp b/HeterogeneousCore/CUDAUtilities/test/HistoContainer_t.cpp
@@ -50,7 +50,8 @@ void go() {
     assert(h4.size()==N);
 
     auto verify = [&](uint32_t i, uint32_t j, uint32_t k, uint32_t t1, uint32_t t2) {
-      assert(t1<N); assert(t2<N);
+      assert((int32_t) t1 < N);
+      assert((int32_t) t2 < N);
       if (i!=j && T(v[t1]-v[t2])<=0) std::cout << "for " << i <<':'<< v[k] <<" failed " << v[t1] << ' ' << v[t2] << std::endl;
     };
 

diff --git a/RecoPixelVertexing/PixelVertexFinding/src/gpuVertexFinder.h b/RecoPixelVertexing/PixelVertexFinding/src/gpuVertexFinder.h
@@ -47,8 +47,8 @@ namespace gpuVertexFinder {
   struct OnCPU {
     OnCPU() = default;
 
-    std::vector<float,    CUDAHostAllocator<float>> z,zerr, chi2;
-    std::vector<int16_t, CUDAHostAllocator<uint16_t>> sortInd;
+    std::vector<float,   CUDAHostAllocator<float>> z,zerr, chi2;
+    std::vector<int16_t, CUDAHostAllocator<int16_t>> sortInd;
     std::vector<int32_t, CUDAHostAllocator<int32_t>> ivtx;
     std::vector<uint16_t, CUDAHostAllocator<uint16_t>> itrk;