Skip to content

Commit

Permalink
Merge pull request #17038 from gartung/SLHCUpgradeSimulations-Geometr…
Browse files Browse the repository at this point in the history
…y-test-fix-clang-warnings

SLHCUpgradeSimulations/Geometry/test fix clang warning hides overloaded virtual
  • Loading branch information
cmsbuild committed Dec 15, 2016
2 parents 85644f6 + 83a22b6 commit 1fc71b8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions SLHCUpgradeSimulations/Geometry/test/FastsimHitNtuplizer.cc
Expand Up @@ -65,7 +65,7 @@ FastsimHitNtuplizer::FastsimHitNtuplizer(edm::ParameterSet const& conf) :

FastsimHitNtuplizer::~FastsimHitNtuplizer() { }

void FastsimHitNtuplizer::endJob()
void FastsimHitNtuplizer::endRun(const edm::Run&, const edm::EventSetup& es)
{
std::cout << " FastsimHitNtuplizer::endJob" << std::endl;
tfile_->Write();
Expand All @@ -74,7 +74,7 @@ void FastsimHitNtuplizer::endJob()



void FastsimHitNtuplizer::beginJob(const edm::EventSetup& es)
void FastsimHitNtuplizer::beginRun(const edm::Run&, const edm::EventSetup& es)
{
std::cout << " FastsimHitNtuplizer::beginJob" << std::endl;
std::string outputFile = conf_.getParameter<std::string>("OutputFile");
Expand Down
4 changes: 2 additions & 2 deletions SLHCUpgradeSimulations/Geometry/test/FastsimHitNtuplizer.h
Expand Up @@ -34,8 +34,8 @@ class FastsimHitNtuplizer : public edm::EDAnalyzer

explicit FastsimHitNtuplizer(const edm::ParameterSet& conf);
virtual ~FastsimHitNtuplizer();
virtual void beginJob(const edm::EventSetup& es);
virtual void endJob();
virtual void beginRun(const edm::Run&, const edm::EventSetup& es);
virtual void endRun(const edm::Run&, const edm::EventSetup& es);
virtual void analyze(const edm::Event& e, const edm::EventSetup& es);

protected:
Expand Down

0 comments on commit 1fc71b8

Please sign in to comment.