From 2918374241d31dd0ff58cb6fec564840e4c49ca5 Mon Sep 17 00:00:00 2001 From: Chris Jones <chrisdjones15@gmail.com> Date: Wed, 31 Jul 2013 19:22:48 -0500 Subject: [PATCH] Have SharedResourcesUser accept any number of arguments in constructor and ignore them. This allows it to work with edm::one::OutputModule<> which needs pass an argument to all its inheriting classes --- yaml --- svn_rev: 124505 current_ref: refs/heads/CMSSW_7_0_X current_commit: 40bb9e7c251e1f069484d0f41fe66e558f8d19bc head_branch: refs/heads/CMSSW_7_0_X migrated_from: v3 --- [refs] | 2 +- trunk/FWCore/Framework/interface/one/implementors.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 80d3269fffdec..5ceb457e35fd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/CMSSW_7_0_X: 4f9d7b3ff6bc5523611db8e6ad546ba2f18f194f +refs/heads/CMSSW_7_0_X: 40bb9e7c251e1f069484d0f41fe66e558f8d19bc diff --git a/trunk/FWCore/Framework/interface/one/implementors.h b/trunk/FWCore/Framework/interface/one/implementors.h index 26b3b29f4740a..0750408850d7f 100644 --- a/trunk/FWCore/Framework/interface/one/implementors.h +++ b/trunk/FWCore/Framework/interface/one/implementors.h @@ -32,11 +32,12 @@ namespace edm { class SharedResourcesUser { public: - SharedResourcesUser() = default; + template< typename... Args> + SharedResourcesUser(Args...) {} SharedResourcesUser(SharedResourcesUser const&) = delete; SharedResourcesUser& operator=(SharedResourcesUser const&) = delete; - virtual ~SharedResourcesUser() = default; + virtual ~SharedResourcesUser() {} protected: static const std::string kUnknownResource;