Merge pull request #7583 from ktf/workaround-icc-bug

Workaround ICC bug.
cms-sw · Feb 13, 2015 · e79b961 · e79b961
2 parents 667aab9 + e7299da
commit e79b961
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/FWCore/Framework/interface/global/EDAnalyzer.h b/FWCore/Framework/interface/global/EDAnalyzer.h
@@ -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 --------------------

diff --git a/FWCore/Framework/interface/global/EDFilter.h b/FWCore/Framework/interface/global/EDFilter.h
@@ -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 --------------------