Changeset 52aacc

Timestamp:

Jul 10, 2012, 1:15:51 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

ce1e39

Parents:

ec4b04

git-author:

Frederik Heber <heber@…> (07/08/12 19:33:05)

git-committer:

Frederik Heber <heber@…> (07/10/12 13:15:51)

Message:

setupDebugger does not require argv anymore.

• required executable name is stored on OptionValues.

File:

• src/bin/mpqc/mpqc.cc (modified) (7 diffs)

src/bin/mpqc/mpqc.cc

@@ -318 +318 @@
   const char *check; // option "c"
   const char *simple_input; // option "i"
+  string executablename;
 
 #ifdef HAVE_CHEMISTRY_CCA
@@ -333 +334 @@
 void parseRemainderOptions(
     GetLongOpt &options,
-    struct OptionValues &values)
+    struct OptionValues &values,
+    int argc,
+    char **argv)
 {
   values.keyvalue = options.retrieve("k");
@@ -340 +343 @@
   values.check = options.retrieve("c");
   values.simple_input = options.retrieve("i");
+  values.executablename = argv[0];
 
 #ifdef HAVE_CHEMISTRY_CCA
@@ -788 +792 @@
  * \param debugger debugger structure
  * \param options parsed command line options
- * \param argv argument array
  */
 void setupDebugger(
@@ -794 +797 @@
     Ref<MessageGrp> &grp,
     Ref<Debugger> &debugger,
-    struct OptionValues &values,
-    char **argv)
+    struct OptionValues &values)
 {
   debugger << keyval->describedclassvalue("debug");
   if (debugger.nonnull()) {
     Debugger::set_default_debugger(debugger);
-    debugger->set_exec(argv[0]);
+    debugger->set_exec(values.executablename.c_str());
     debugger->set_prefix(grp->me());
     if (values.debug)
@@ -1173 +1175 @@
   ComputeOptions(options, output, outstream);
   OptionValues values;
-  parseRemainderOptions(options, values);
+  parseRemainderOptions(options, values, argc, argv);
 
   // get the message group.  first try the commandline and environment
@@ -1231 +1233 @@
   // now set up the debugger
   Ref<Debugger> debugger;
-  setupDebugger(keyval, grp, debugger, values, argv);
+  setupDebugger(keyval, grp, debugger, values);
 
   // now check to see what matrix kit to use