Import Geant4 5.0.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-08 16:57:27 +02:00
parent 330b82b769
commit 37fff30d2e
5733 changed files with 263867 additions and 74574 deletions
+5 -4
View File
@@ -22,8 +22,8 @@
//
//
// 12/06/2002 G4UIGainServer H. MInamimoto and H. Yoshida created
// $Id: G4UIGainServer.cc,v 1.3 2002/06/14 02:18:00 yhajime Exp $
// $Name: geant4-04-01 $
// $Id: G4UIGainServer.cc,v 1.5 2002/12/05 16:33:42 asaim Exp $
// $Name: geant4-05-00 $
//
#ifndef WIN32
@@ -404,7 +404,8 @@ void G4UIGainServer::WaitingConnection(){
len = sizeof(caddr);
for(int i=1;i<=2;i++){
if((socketD[i] = accept(socketD[0], (struct sockaddr *)&caddr,(int *)&len))<0){
// if((socketD[i] = accept(socketD[0], (struct sockaddr *)&caddr,(int *)&len))<0){
if((socketD[i] = accept(socketD[0], (struct sockaddr *)&caddr,(socklen_t *)&len))<0){
G4cerr<<"accept:"<<i<<G4endl;
exit(1);
}
@@ -778,7 +779,7 @@ void G4UIGainServer::SendDisableList(G4UIcommandTree* tree,int level){
///////////////////////////////
void G4UIGainServer::UpdateState(void){
///////////////////////////////
static G4ApplicationState previousState= PreInit;
static G4ApplicationState previousState= G4State_PreInit;
G4ApplicationState newState;
G4StateManager *statM = G4StateManager::GetStateManager();
newState = statM->GetCurrentState();