Merge pull request #11951 from davidlt/fix-priv-macros-DataFormats-Ec…

…alDigi DataFormats/EcalDigi: remove intrusive macros breaking libstdc++
cms-sw · Oct 19, 2015 · cf89ee4 · cf89ee4
2 parents 284dfdb + ec0978f
commit cf89ee4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/DataFormats/Common/interface/DataFrameContainer.h b/DataFormats/Common/interface/DataFrameContainer.h
@@ -11,6 +11,9 @@
 
 class TestDataFrame;
 
+template<typename DigiCollection>
+class TestEcalDigi;
+
 namespace edm {
 
   /** an optitimized container that linearized a "vector of vector".
@@ -187,6 +190,9 @@ namespace edm {
   private:
     //for testing
     friend class ::TestDataFrame;
+
+    template<typename DigiCollection>
+    friend class ::TestEcalDigi;
 
     // subdetector id (as returned by  DetId::subdetId())
     int m_subdetId;

diff --git a/DataFormats/EcalDigi/test/EcalDigi_t.cpp b/DataFormats/EcalDigi/test/EcalDigi_t.cpp
@@ -1,11 +1,10 @@
 #include <Utilities/Testing/interface/CppUnit_testdriver.icpp>
 #include <cppunit/extensions/HelperMacros.h>
 
-#define private public
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/Common/interface/DataFrame.h"
 #include "DataFormats/Common/interface/DataFrameContainer.h"
-#undef private
+
 #include<vector>
 #include<algorithm>
 #include<boost/function.hpp>