Merge pull request #29888 from fwyzard/Apply_clang-format_Heterogeneo…

…usCore Apply code checks to the HeterogeneousCore packages
cms-sw · May 18, 2020 · d2fe90a · d2fe90a
2 parents edbe589 + d805410
commit d2fe90a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/HeterogeneousCore/SonicCore/interface/SonicClientAsync.h b/HeterogeneousCore/SonicCore/interface/SonicClientAsync.h
@@ -10,7 +10,7 @@ template <typename InputT, typename OutputT = InputT>
 class SonicClientAsync : public SonicClientBase, public SonicClientTypes<InputT, OutputT> {
 public:
   //main operation
-  void dispatch(edm::WaitingTaskWithArenaHolder holder) override final {
+  void dispatch(edm::WaitingTaskWithArenaHolder holder) final {
     holder_ = std::move(holder);
     setStartTime();
     evaluate();

diff --git a/HeterogeneousCore/SonicCore/interface/SonicClientPseudoAsync.h b/HeterogeneousCore/SonicCore/interface/SonicClientPseudoAsync.h
@@ -33,7 +33,7 @@ class SonicClientPseudoAsync : public SonicClientBase, public SonicClientTypes<I
     }
   }
   //accessor
-  void dispatch(edm::WaitingTaskWithArenaHolder holder) override final {
+  void dispatch(edm::WaitingTaskWithArenaHolder holder) final {
     //do all read/writes inside lock to ensure cache synchronization
     {
       std::lock_guard<std::mutex> guard(mutex_);

diff --git a/HeterogeneousCore/SonicCore/interface/SonicClientSync.h b/HeterogeneousCore/SonicCore/interface/SonicClientSync.h
@@ -12,7 +12,7 @@ template <typename InputT, typename OutputT = InputT>
 class SonicClientSync : public SonicClientBase, public SonicClientTypes<InputT, OutputT> {
 public:
   //main operation
-  void dispatch(edm::WaitingTaskWithArenaHolder holder) override final {
+  void dispatch(edm::WaitingTaskWithArenaHolder holder) final {
     holder_ = std::move(holder);
     setStartTime();
 

diff --git a/HeterogeneousCore/SonicCore/interface/SonicEDProducer.h b/HeterogeneousCore/SonicCore/interface/SonicEDProducer.h
@@ -22,13 +22,11 @@ class SonicEDProducer : public edm::stream::EDProducer<edm::ExternalWork, Capabi
   //constructor
   SonicEDProducer(edm::ParameterSet const& cfg) : client_(cfg.getParameter<edm::ParameterSet>("Client")) {}
   //destructor
-  virtual ~SonicEDProducer() = default;
+  ~SonicEDProducer() override = default;
 
   //derived classes use a dedicated acquire() interface that incorporates client_.input()
   //(no need to interact with callback holder)
-  void acquire(edm::Event const& iEvent,
-               edm::EventSetup const& iSetup,
-               edm::WaitingTaskWithArenaHolder holder) override final {
+  void acquire(edm::Event const& iEvent, edm::EventSetup const& iSetup, edm::WaitingTaskWithArenaHolder holder) final {
     auto t0 = std::chrono::high_resolution_clock::now();
     acquire(iEvent, iSetup, client_.input());
     auto t1 = std::chrono::high_resolution_clock::now();
@@ -39,7 +37,7 @@ class SonicEDProducer : public edm::stream::EDProducer<edm::ExternalWork, Capabi
   }
   virtual void acquire(edm::Event const& iEvent, edm::EventSetup const& iSetup, Input& iInput) = 0;
   //derived classes use a dedicated produce() interface that incorporates client_.output()
-  void produce(edm::Event& iEvent, edm::EventSetup const& iSetup) override final {
+  void produce(edm::Event& iEvent, edm::EventSetup const& iSetup) final {
     //todo: measure time between acquire and produce
     produce(iEvent, iSetup, client_.output());
   }