Changeset 75793b2 for molecuilder/src/parser.cpp

Timestamp:

Jun 7, 2008, 1:20:30 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

42bdb2, a89a22

Parents:

a1c448

Message:

these are all smaller fixes due to extensively enabled compiler warnings

e.g. local variable shadows global (mol::nr by local nr)
and others

File:

• molecuilder/src/parser.cpp (modified) (5 diffs)

molecuilder/src/parser.cpp

@@ -101 +101 @@
   ifstream input;
   char *FragmentNumber = NULL;
-  stringstream line;
+  stringstream file;
   
   Header = (char *) Malloc(sizeof(char)*1023, "MatrixContainer::ParseMatrix: *EnergyHeader");
@@ -107 +107 @@
   // count the number of matrices
   MatrixCounter = -1; // we count one too much
-  line << name << FRAGMENTPREFIX << KEYSETFILE;
-  input.open(line.str().c_str(), ios::in);
+  file << name << FRAGMENTPREFIX << KEYSETFILE;
+  input.open(file.str().c_str(), ios::in);
   if (input == NULL) {
-    cout << endl << "Unable to open " << line.str() << ", is the directory correct?" << endl;
+    cout << endl << "Unable to open " << file.str() << ", is the directory correct?" << endl;
     return false;
   }
@@ -182 +182 @@
       Matrix[i][j] = (double *) Malloc(sizeof(double)*ColumnCounter, "MatrixContainer::ParseMatrix: *Matrix[][]");
       input.getline(filename, 1023);
-      stringstream line(filename);
+      stringstream lines(filename);
       //cout << "Matrix at level " << j << ":";// << filename << endl;
       for(int k=skipcolumns;k--;)
-        line >> filename;
+        lines >> filename;
       for(int k=0;(k<ColumnCounter) && (!line.eof());k++) {
-        line >> Matrix[i][j][k];
+        lines >> Matrix[i][j][k];
         //cout << " " << setprecision(2) << Matrix[i][j][k];;
       }
@@ -522 +522 @@
   ifstream input;
   char *FragmentNumber = NULL;
-  stringstream line;
+  stringstream file;
   char filename[1023];
   
@@ -530 +530 @@
   for(int i=FragmentCounter;i--;)
     KeySets[i] = NULL;
-  line << name << FRAGMENTPREFIX << KEYSETFILE;
-  input.open(line.str().c_str(), ios::in);
+  file << name << FRAGMENTPREFIX << KEYSETFILE;
+  input.open(file.str().c_str(), ios::in);
   if (input == NULL) {
-    cout << endl << "Unable to open " << line.str() << ", is the directory correct?" << endl;
+    cout << endl << "Unable to open " << file.str() << ", is the directory correct?" << endl;
     return false;
   }