Corrections of standard namespace

diff --git a/Flugg/FGeometryInit.cxx b/Flugg/FGeometryInit.cxx
index b20ffe775723ba96e7c04e14780281b2fe96b0c7..86961f5ac7f9c9e9591c83e15629e586bcd35bc8 100644 (file)
--- a/Flugg/FGeometryInit.cxx
+++ b/Flugg/FGeometryInit.cxx
@@ -624,9 +624,9 @@ void FGeometryInit::PrintMaterialTables(G4std::ostream& os) {
   size_t nElements = G4Element::GetNumberOfElements();
   size_t nMaterials = G4Material::GetNumberOfMaterials();
 
-  os << "* In Geant4 there are " << nMaterials << " materials" << endl;
-  os << "* In Geant4 there are " << nElements  << " elements"  << endl;
-  os << "* In Geant4 there are " << nIsotopes  << " isotopes"  << endl;
+  os << "* In Geant4 there are " << nMaterials << " materials" << G4endl;
+  os << "* In Geant4 there are " << nElements  << " elements"  << G4endl;
+  os << "* In Geant4 there are " << nIsotopes  << " isotopes"  << G4endl;
 
   //Materials
   G4cout << "\t* Printing FLUKA materials..." << G4endl;

diff --git a/TFluka/TFluka.h b/TFluka/TFluka.h
index 31da47ba3052eba812a61cbb05db650dae549bb7..ce72dd9608c15a972733a77f6b54fc017db6d972 100644 (file)
--- a/TFluka/TFluka.h
+++ b/TFluka/TFluka.h
@@ -315,9 +315,9 @@ class TFluka : public TVirtualMC {
   //Index of fluka region at each step
   Int_t fCurrentFlukaRegion;
   //Map between volume name and media indices
-  map<TString, Int_t, less<TString> > fVolumeMediaMap;
+  std::map<TString, Int_t, std::less<TString> > fVolumeMediaMap;
   //Map between region and media indices
-  vector<Int_t> fMediaByRegion;
+  std::vector<Int_t> fMediaByRegion;
 
 
   ClassDef(TFluka,1)  //C++ interface to Fluka montecarlo