Changeset 1243 for trunk/source/interfaces/basic/include

Timestamp:

Apr 21, 2010, 3:51:50 PM (16 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/interfaces/basic/include

Files:

• G4UIExecutive.hh (modified) (2 diffs)
• G4UIExecutive.icc (modified) (3 diffs)

trunk/source/interfaces/basic/include/G4UIExecutive.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4UIExecutive.hh,v 1.3 2009/05/28 06:13:03 kmura Exp $
+// $Id: G4UIExecutive.hh,v 1.4 2009/11/20 22:10:31 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -65 +65 @@
 
 public:
-  G4UIExecutive(G4int argc=1, char** argv=0);
+  G4UIExecutive(G4int argc, char** argv);
   ~G4UIExecutive();
 

trunk/source/interfaces/basic/include/G4UIExecutive.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIExecutive.icc,v 1.4 2009/05/28 06:13:03 kmura Exp $
+// $Id: G4UIExecutive.icc,v 1.6 2009/11/20 22:10:31 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -55 +55 @@
 #endif
 
+#define DISCARD_PARAMETER(p) (void)p
+
 /////////////////////////////////////////////////////
-#if defined(G4UI_USE_XM) || defined(G4UI_USE_QT)
 G4UIExecutive::G4UIExecutive(G4int argc, char** argv)
-#else
-G4UIExecutive::G4UIExecutive(G4int, char**)
-#endif
   : session(0), shell(0),isGUI(false)
 /////////////////////////////////////////////////////
 {
 #if defined(G4UI_USE_TCSH)
+  DISCARD_PARAMETER(argc);
+  DISCARD_PARAMETER(argv);
+
   shell = new G4UItcsh;
   session = new G4UIterminal(shell);
@@ -73 +74 @@
 
 #elif defined(G4UI_USE_WIN32)
+  DISCARD_PARAMETER(argc);
+  DISCARD_PARAMETER(argv);
+
   session = new G4UIWin32();
 
 #elif defined(G4UI_USE_QT)
-//  G4int argc2 = 0;
-//  char** argv2 = 0;
   session = new G4UIQt(argc, argv);
-//  session = new G4UIQt(argc2, argv2);
   isGUI = true;
     
 #else
+  DISCARD_PARAMETER(argc);
+  DISCARD_PARAMETER(argv);
+
   shell = new G4UIcsh;
   session = new G4UIterminal(shell);