Merge pull request #11659 from civanch/private_public_g4geom

removed private_public in unit test
cms-sw · Oct 7, 2015 · 327a5cb · 327a5cb
2 parents 7c143c7 + 74f0e8f
commit 327a5cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/SimG4Core/Geometry/interface/DDG4SolidConverter.h b/SimG4Core/Geometry/interface/DDG4SolidConverter.h
@@ -16,6 +16,7 @@ class DDG4SolidConverter
     ~DDG4SolidConverter();
     typedef G4VSolid * (*FNPTR) (const DDSolid &); // pointer to function
     G4VSolid * convert(const DDSolid &);  
+
 private:  
     /* foreach supported solid add a static conversion routine ,
        register this method in the convDispatch_-map */    
@@ -32,8 +33,8 @@ class DDG4SolidConverter
     static G4VSolid * polycone_rrz(const DDSolid &);
     static G4VSolid * polyhedra_rz(const DDSolid &);
     static G4VSolid * polyhedra_rrz(const DDSolid &);
+    static G4VSolid * pseudotrap(const DDSolid & s);
     static G4VSolid * torus(const DDSolid &);
-    static G4VSolid * pseudotrap(const DDSolid &);
     static G4VSolid * trunctubs(const DDSolid &);
     static G4VSolid * sphere(const DDSolid &);
     static G4VSolid * orb(const DDSolid &);
@@ -42,6 +43,9 @@ class DDG4SolidConverter
     static G4VSolid * para(const DDSolid &);
     static const std::vector<double>* par_;
     std::map<DDSolidShape,FNPTR> convDispatch_;
+
+    friend class testTruncTubs;
+    friend class testPseudoTrap;
 };
 
 #endif
diff --git a/SimG4Core/Geometry/test/PseudoTrap_.cpp b/SimG4Core/Geometry/test/PseudoTrap_.cpp
@@ -9,7 +9,6 @@
 #include <G4VSolid.hh>
 
 #include <string>
-#define private public
 #include <SimG4Core/Geometry/interface/DDG4SolidConverter.h>
 
 class testPseudoTrap : public CppUnit::TestFixture

diff --git a/SimG4Core/Geometry/test/TruncTubs_.cpp b/SimG4Core/Geometry/test/TruncTubs_.cpp
@@ -9,8 +9,6 @@
 #include <G4VSolid.hh>
 
 #include <string>
-
-#define private public
 #include <SimG4Core/Geometry/interface/DDG4SolidConverter.h>
 
 class testTruncTubs : public CppUnit::TestFixture