Import Geant4 5.2.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-09 10:28:22 +02:00
parent fbd4999cf7
commit 4aea781e80
5454 changed files with 223141 additions and 67347 deletions
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4CompositeEMDataSet.cc,v 1.6 2002/05/28 09:20:18 pia Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4CompositeEMDataSet.cc,v 1.7 2003/06/16 17:00:05 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
//
@@ -35,8 +35,8 @@
#include "G4CompositeEMDataSet.hh"
#include "G4EMDataSet.hh"
#include "G4VDataSetAlgorithm.hh"
#include "g4std/fstream"
#include "g4std/strstream"
#include <fstream>
#include <strstream>
G4CompositeEMDataSet::G4CompositeEMDataSet(G4VDataSetAlgorithm* interpolation,
@@ -106,7 +106,7 @@ void G4CompositeEMDataSet::LoadData(const G4String& fileName)
// Build the complete string identifying the file with the data set
char nameChar[100] = {""};
G4std::ostrstream ost(nameChar, 100, G4std::ios::out);
std::ostrstream ost(nameChar, 100, std::ios::out);
ost << fileName << Z << ".dat";
@@ -122,8 +122,8 @@ void G4CompositeEMDataSet::LoadData(const G4String& fileName)
G4String pathString(path);
G4String separator = G4String("/");
G4String dirFile = pathString + separator + name;
G4std::ifstream file(dirFile);
G4std::filebuf* lsdp = file.rdbuf();
std::ifstream file(dirFile);
std::filebuf* lsdp = file.rdbuf();
if (! (lsdp->is_open()) )
{