[Avida-SVN] r1206 - in development: . source/main

[avidaedward at myxo.css.msu.edu]

Author: avidaedward
Date: 2007-01-28 01:10:49 -0500 (Sun, 28 Jan 2007)
New Revision: 1206

Modified:
   development/
   development/source/main/cAvidaConfig.cc
Log:
 r1248 at clearly:  kaben | 2007-01-22 22:31:54 -0500
 Changed cAvidaConfig::LoadWithArgs() to no longer destroy argument 'argv'.



Property changes on: development
___________________________________________________________________
Name: svk:merge
   - 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/development:1246
   + 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/development:1248

Modified: development/source/main/cAvidaConfig.cc
===================================================================
--- development/source/main/cAvidaConfig.cc	2007-01-28 06:10:46 UTC (rev 1205)
+++ development/source/main/cAvidaConfig.cc	2007-01-28 06:10:49 UTC (rev 1206)
@@ -15,6 +15,7 @@
 #include "cActionLibrary.h"
 #include "cDriverManager.h"
 #include "cInitFile.h"
+#include "cStringIterator.h"
 #include "tDictionary.h"
 
 tList<cAvidaConfig::cBaseConfigGroup> cAvidaConfig::global_group_list;
@@ -319,8 +320,10 @@
   // Load all of the args into string objects for ease of access.
   int argc = argv.GetSize();
   cString* args = new cString[argc];
-  for (int i = 0; i < argc; i++) {
-    args[i] = argv.Pop();
+  cStringIterator list_it(argv);
+  for (int i = 0; (i < argc) && (list_it.AtEnd() == false); i++) {
+    list_it.Next();
+    args[i] = list_it.Get();
   }
   
   // -config option