Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround ICC bug. #7583

Merged
merged 4 commits into from Feb 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion FWCore/Framework/interface/global/EDAnalyzer.h
Expand Up @@ -35,7 +35,12 @@ namespace edm {

public:
EDAnalyzer() = default;

// We do this only in the case of the intel compiler as this might
// end up creating a lot of code bloat due to inline symbols being generated
// in each DSO which uses this header.
#ifdef __INTEL_COMPILER
virtual ~EDAnalyzer() {}
#endif
// ---------- const member functions ---------------------

// ---------- static member functions --------------------
Expand Down
14 changes: 10 additions & 4 deletions FWCore/Framework/interface/global/EDFilter.h
Expand Up @@ -29,16 +29,22 @@
namespace edm {
namespace global {
template< typename... T>
class EDFilter : public filter::SpecializeAbilityToImplementor<
class EDFilter :
public virtual EDFilterBase,
public filter::SpecializeAbilityToImplementor<
CheckAbility<edm::module::Abilities::kRunSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndRunProducer,T...>::kHasIt,
CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer,T...>::kHasIt,
T>::Type...,
public virtual EDFilterBase
T>::Type...
{

public:
EDFilter() = default;

// We do this only in the case of the intel compiler as this might
// end up creating a lot of code bloat due to inline symbols being generated
// in each DSO which uses this header.
#ifdef __INTEL_COMPILER
virtual ~EDFilter() = default;
#endif
// ---------- const member functions ---------------------

// ---------- static member functions --------------------
Expand Down