Import Geant4 10.0.0 source tree

environments/g4py/source/materials/pyG4Material.cc

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: pyG4Material.cc,v 1.7 2008-12-04 08:55:25 kmura Exp $
-// $Name: not supported by cvs2svn $
+// $Id: pyG4Material.cc 76884 2013-11-18 12:54:03Z gcosmo $
 // ====================================================================
 //   pyG4Material.cc
 //
@@ -47,12 +46,10 @@ void (G4Material::*f1_AddElement)(G4Element*, G4int)
 void (G4Material::*f2_AddElement)(G4Element*, G4double)
   = &G4Material::AddElement;
 
-#if G4VERSION_NUMBER >= 800
-BOOST_PYTHON_FUNCTION_OVERLOADS(f_GetMaterial, G4Material::GetMaterial, 1, 2);
-#endif
+BOOST_PYTHON_FUNCTION_OVERLOADS(f_GetMaterial, G4Material::GetMaterial, 1, 2)
 
 // raw pointer -> Python list conversion
-list f_GetFractionVector(const G4Material* material) 
+list f_GetFractionVector(const G4Material* material)
 {
   list fracList;
   const G4double* fracVec= material-> GetFractionVector();
@@ -119,16 +116,11 @@ void export_G4Material()
     .def("AddElement",          f1_AddElement)
     .def("AddElement",          f2_AddElement)
     .def("AddMaterial",         &G4Material::AddMaterial)
-#if G4VERSION_NUMBER >= 920
     .def("GetName",             &G4Material::GetName,
          return_value_policy<reference_existing_object>())
     .def("GetChemicalFormula",  &G4Material::GetChemicalFormula,
          return_value_policy<reference_existing_object>())
     .def("SetName",             &G4Material::SetName)
-#else
-    .def("GetName",             &G4Material::GetName)
-    .def("GetChemicalFormula",  &G4Material::GetChemicalFormula)
-#endif
     .def("SetChemicalFormula",  &G4Material::SetChemicalFormula)
     .def("GetDensity",          &G4Material::GetDensity)
     .def("GetState",            &G4Material::GetState)
@@ -165,14 +157,9 @@ void export_G4Material()
     .def("GetNumberOfMaterials",  &G4Material::GetNumberOfMaterials)
     .staticmethod("GetNumberOfMaterials")
     .def("GetIndex",              &G4Material::GetIndex)
-#if G4VERSION_NUMBER >= 800
     .def("GetMaterial",           &G4Material::GetMaterial,
-	 f_GetMaterial()
-	 [return_value_policy<reference_existing_object>()])
-#else
-    .def("GetMaterial",           &G4Material::GetMaterial,
-         return_value_policy<reference_existing_object>())
-#endif
+      f_GetMaterial()
+      [return_value_policy<reference_existing_object>()])
     .staticmethod("GetMaterial")
     // ---
     //.def(self_ns::str(self))