Changeset 1412 for trunk

Timestamp:

01/31/08 15:17:03 (17 years ago)

Author:

Malte Marquarding

Message:

use stl type array iterators as in the new version of casacore

File:

• trunk/src/MathUtils.cpp (modified) (2 diffs)

trunk/src/MathUtils.cpp

@@ -85 +85 @@
 {
   std::vector<std::string> out;
-  VectorSTLIterator<String> it(in);
-  for (uInt i=0; it != in.end(); ++it,++i) {
+  out.reserve(in.nelements());
+  for (Array<String>::const_iterator it = in.begin(); it != in.end(); ++it) {
     out.push_back(*it);
   }
@@ -95 +95 @@
 {
   Vector<String> out(in.size());
-  uInt i=0;
-  std::vector<std::string>::const_iterator it;
-  for (it=in.begin();it != in.end();++it,++i) {
-    out[i] = casa::String(*it);
+  Array<String>::iterator oit = out.begin();
+  for (std::vector<std::string>::const_iterator it=in.begin() ;
+       it != in.end(); ++it,++oit) {
+    *oit = *it;
   }
   return out;