Changeset cccac6 for molecuilder/src/parser.cpp

Timestamp:

Jun 22, 2008, 1:27:47 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

7a40c8

Parents:

b73d28 (diff), 73bc6b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'bisect' into AdaptiveMolecuilder

File:

• molecuilder/src/parser.cpp (modified) (1 diff)

molecuilder/src/parser.cpp

@@ -186 +186 @@
       for(int k=skipcolumns;k--;)
         lines >> filename;
-      for(int k=0;(k<ColumnCounter) && (!line.eof());k++) {
+      for(int k=0;(k<ColumnCounter) && (!lines.eof());k++) {
         lines >> Matrix[i][j][k];
         //cout << " " << setprecision(2) << Matrix[i][j][k];;