From 8ec0847aabca97e5550802063d1dca7469a0e14c Mon Sep 17 00:00:00 2001
From: Christopher Jones <chrisdjones15@gmail.com>
Date: Fri, 6 Apr 2018 09:48:25 -0500
Subject: [PATCH] Minor cleanups to avoid clang warnings

-Removed an unused parameter in a lambda
-Switched a struct to be a class to be consistent with other headers
-Delcared noexcept(false) to be consistent between header and source file
---
 FWCore/Framework/interface/ProducerBase.h   | 2 +-
 FWCore/Framework/src/EventProcessor.cc      | 2 +-
 FWCore/Framework/test/MockEventProcessor.cc | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/FWCore/Framework/interface/ProducerBase.h b/FWCore/Framework/interface/ProducerBase.h
index 3896584ba3b36..865b2d4953080 100644
--- a/FWCore/Framework/interface/ProducerBase.h
+++ b/FWCore/Framework/interface/ProducerBase.h
@@ -60,7 +60,7 @@ namespace edm {
   public:
     typedef ProductRegistryHelper::TypeLabelList TypeLabelList;
     ProducerBase ();
-    ~ProducerBase() override;
+    ~ProducerBase() noexcept(false) override;
  
     /// used by the fwk to register list of products
     std::function<void(BranchDescription const&)> registrationCallback() const;
diff --git a/FWCore/Framework/src/EventProcessor.cc b/FWCore/Framework/src/EventProcessor.cc
index 532d7e04c5520..838962e8eb01f 100644
--- a/FWCore/Framework/src/EventProcessor.cc
+++ b/FWCore/Framework/src/EventProcessor.cc
@@ -1118,7 +1118,7 @@ namespace edm {
     
     auto status= std::make_shared<LuminosityBlockProcessingStatus>(this, preallocations_.numberOfStreams(), iRunResource) ;
 
-    auto lumiWork = [this, iHolder, iSync, status](edm::LimitedTaskQueue::Resumer iResumer) mutable {
+    auto lumiWork = [this, iHolder, status](edm::LimitedTaskQueue::Resumer iResumer) mutable {
       if(iHolder.taskHasFailed()) { return; }
 
       status->setResumer(std::move(iResumer));
diff --git a/FWCore/Framework/test/MockEventProcessor.cc b/FWCore/Framework/test/MockEventProcessor.cc
index 6992bc04b6483..dc95cba24e619 100644
--- a/FWCore/Framework/test/MockEventProcessor.cc
+++ b/FWCore/Framework/test/MockEventProcessor.cc
@@ -30,7 +30,8 @@ namespace {
 }
 
 namespace edm {
-struct LuminosityBlockPrincipal {
+class LuminosityBlockPrincipal {
+public:
   LuminosityBlockPrincipal(int iRun,int iLumi): run_(iRun),lumi_(iLumi){}
   int run_;
   int lumi_;