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;