Import Geant4 8.0.0 source tree
This commit is contained in:
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UImanager.cc,v 1.29 2003/06/16 16:55:45 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// $Id: G4UImanager.cc,v 1.30 2005/10/26 06:10:22 kmura Exp $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------------
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "G4UIaliasList.hh"
|
||||
#include "G4Tokenizer.hh"
|
||||
|
||||
#include <strstream>
|
||||
#include <sstream>
|
||||
|
||||
|
||||
G4UImanager * G4UImanager::fUImanager = 0;
|
||||
@@ -161,7 +161,7 @@ const char * aParameterName, G4bool reGet)
|
||||
GetCurrentStringValue( aCommand, aParameterName, reGet );
|
||||
G4int value;
|
||||
const char* t = targetParameter;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> value;
|
||||
return value;
|
||||
}
|
||||
@@ -173,7 +173,7 @@ G4int parameterNumber, G4bool reGet)
|
||||
GetCurrentStringValue( aCommand, parameterNumber, reGet );
|
||||
G4int value;
|
||||
const char* t = targetParameter;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> value;
|
||||
return value;
|
||||
}
|
||||
@@ -185,7 +185,7 @@ const char * aParameterName, G4bool reGet)
|
||||
GetCurrentStringValue( aCommand, aParameterName, reGet );
|
||||
G4double value;
|
||||
const char* t = targetParameter;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> value;
|
||||
return value;
|
||||
}
|
||||
@@ -197,7 +197,7 @@ G4int parameterNumber, G4bool reGet)
|
||||
GetCurrentStringValue( aCommand, parameterNumber, reGet );
|
||||
G4double value;
|
||||
const char* t = targetParameter;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> value;
|
||||
return value;
|
||||
}
|
||||
@@ -233,7 +233,7 @@ void G4UImanager::LoopS(const char* valueList)
|
||||
c1 += " ";
|
||||
c1 += parameterToken();
|
||||
const char* t1 = c1;
|
||||
std::istrstream is((char*)t1);
|
||||
std::istringstream is(t1);
|
||||
G4double d1;
|
||||
G4double d2;
|
||||
G4double d3;
|
||||
@@ -247,10 +247,9 @@ void G4UImanager::Loop(const char * macroFile,const char * variableName,
|
||||
G4String cd;
|
||||
for(G4double d=initialValue;d<=finalValue;d+=stepSize)
|
||||
{
|
||||
char st[20];
|
||||
std::ostrstream os(st,20);
|
||||
os << d << '\0';
|
||||
cd += st;
|
||||
std::ostringstream os;
|
||||
os << d;
|
||||
cd += os.str();
|
||||
cd += " ";
|
||||
}
|
||||
Foreach(macroFile,variableName,cd);
|
||||
|
||||
Reference in New Issue
Block a user