Changeset c1e0da for molecuilder/src/builder.cpp

Timestamp:

May 17, 2010, 5:31:35 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

5fa7c5

Parents:

65a563

Message:

FIX: list of arguments passed to ParseCommandLineOptions() should be unique.

• converted list<> to set<> such that argument counters are unique.

File:

• molecuilder/src/builder.cpp (modified) (4 diffs)

molecuilder/src/builder.cpp

@@ -1494 +1494 @@
  */
 static int ParseCommandLineOptions(int argc, char **argv, MoleculeListClass *&molecules, periodentafel *&periode,
-                                   config& configuration, char *&ConfigFileName, list<int> &ArgcList)
+                                   config& configuration, char *&ConfigFileName, set<int> &ArgcList)
 {
   Vector x,y,z,n;  // coordinates for absolute point in cell volume
@@ -1525 +1525 @@
           case 'H':
           case '?':
-            ArgcList.push_back(argptr-1);
+            ArgcList.insert(argptr-1);
             return(1);
             break;
           case 'v':
-            ArgcList.push_back(argptr-1);
+            ArgcList.insert(argptr-1);
             return(1);
             break;
           case 'V':
-            ArgcList.push_back(argptr-1);
-            ArgcList.push_back(argptr);
+            ArgcList.insert(argptr-1);
+            ArgcList.insert(argptr);
             argptr++;
             break;
@@ -2509 +2509 @@
     // Parse command line options and if present create respective UI
     {
-      list<int> ArgcList;
-      ArgcList.push_back(0); // push back program!
-      ArgcList.push_back(1); // push back config file name
+      set<int> ArgcList;
+      ArgcList.insert(0); // push back program!
+      ArgcList.insert(1); // push back config file name
       char ConfigFileName[MAXSTRINGSIZE];
       // handle arguments by ParseCommandLineOptions()
@@ -2518 +2518 @@
       Arguments = Malloc<char *>(ArgcList.size(), "main - **Arguments");
       cout << "The following arguments are handled by CommandLineParser: ";
-      for (list<int>::iterator ArgcRunner = ArgcList.begin(); ArgcRunner != ArgcList.end(); ++ArgcRunner) {
+      for (set<int>::iterator ArgcRunner = ArgcList.begin(); ArgcRunner != ArgcList.end(); ++ArgcRunner) {
         Arguments[ArgcSize] = Malloc<char>(strlen(argv[*ArgcRunner])+2, "main - *Arguments[]");
         strcpy(Arguments[ArgcSize], argv[*ArgcRunner]);