Skip to content

Commit

Permalink
Have SharedResourcesUser accept any number of arguments in constructo…
Browse files Browse the repository at this point in the history
…r 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: 40bb9e7
head_branch: refs/heads/CMSSW_7_0_X
migrated_from: v3
  • Loading branch information
Dr15Jones committed Aug 1, 2013
1 parent 750607a commit 2918374
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/CMSSW_7_0_X: 4f9d7b3ff6bc5523611db8e6ad546ba2f18f194f
refs/heads/CMSSW_7_0_X: 40bb9e7c251e1f069484d0f41fe66e558f8d19bc
5 changes: 3 additions & 2 deletions trunk/FWCore/Framework/interface/one/implementors.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2918374

Please sign in to comment.