Fix clang warnings (#387)

cms-patatrack · Oct 8, 2020 · b28a74f · b28a74f
1 parent 7112113
commit b28a74f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/RecoLocalTracker/SiPixelClusterizer/interface/SiPixelFedCablingMapGPU.h b/RecoLocalTracker/SiPixelClusterizer/interface/SiPixelFedCablingMapGPU.h
@@ -13,14 +13,14 @@ namespace pixelgpudetails {
 
 // TODO: since this has more information than just cabling map, maybe we should invent a better name?
 struct SiPixelFedCablingMapGPU {
-  unsigned int fed[pixelgpudetails::MAX_SIZE] alignas(128);
-  unsigned int link[pixelgpudetails::MAX_SIZE] alignas(128);
-  unsigned int roc[pixelgpudetails::MAX_SIZE] alignas(128);
-  unsigned int RawId[pixelgpudetails::MAX_SIZE] alignas(128);
-  unsigned int rocInDet[pixelgpudetails::MAX_SIZE] alignas(128);
-  unsigned int moduleId[pixelgpudetails::MAX_SIZE] alignas(128);
-  unsigned char badRocs[pixelgpudetails::MAX_SIZE] alignas(128);
-  unsigned int size = 0;
+  alignas(128) unsigned int fed[pixelgpudetails::MAX_SIZE];
+  alignas(128) unsigned int link[pixelgpudetails::MAX_SIZE];
+  alignas(128) unsigned int roc[pixelgpudetails::MAX_SIZE];
+  alignas(128) unsigned int RawId[pixelgpudetails::MAX_SIZE];
+  alignas(128) unsigned int rocInDet[pixelgpudetails::MAX_SIZE];
+  alignas(128) unsigned int moduleId[pixelgpudetails::MAX_SIZE];
+  alignas(128) unsigned char badRocs[pixelgpudetails::MAX_SIZE];
+  alignas(128) unsigned int size = 0;
 };
 
 #endif
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelDigisClustersFromSoA.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelDigisClustersFromSoA.cc
@@ -45,8 +45,6 @@ namespace {
       return true;
     }
   };
-
-  constexpr uint32_t dummydetid = 0xffffffff;
 }  // namespace
 
 class SiPixelDigisClustersFromSoA : public edm::global::EDProducer<> {

diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitCUDA.cc b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitCUDA.cc
@@ -96,10 +96,9 @@ void SiPixelRecHitCUDA::produce(edm::StreamID streamID, edm::Event& iEvent, cons
   iEvent.getByToken(tBeamSpot, hbs);
   auto const& bs = ctx.get(*hbs);
 
-  ctx.emplace(
-      iEvent,
-      tokenHit_,
-      std::move(gpuAlgo_.makeHitsAsync(digis, clusters, bs, fcpe->getGPUProductAsync(ctx.stream()), ctx.stream())));
+  ctx.emplace(iEvent,
+              tokenHit_,
+              gpuAlgo_.makeHitsAsync(digis, clusters, bs, fcpe->getGPUProductAsync(ctx.stream()), ctx.stream()));
 }
 
 DEFINE_FWK_MODULE(SiPixelRecHitCUDA);