[Genabel-commits] r1022 - branches/ProbABEL-refactoring/ProbABEL/src

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2012-11-15 08:45:09 +0100 (Thu, 15 Nov 2012)
New Revision: 1022

Modified:
   branches/ProbABEL-refactoring/ProbABEL/src/data.cpp
Log:
Ported changes from ProbABEL trunk r966 to the refactoring branch (the CHANGES.LOG file was already updated in the merge of the branch with trunk). 

This was the original log message:
Fixed bug #1186: Wrong error message in ProbABEL when .map file missing. Thanks to Nicola Pirastu for reporting this.

Also updated CHANGES.LOG to reflect this as well as the previous bugfix.


Modified: branches/ProbABEL-refactoring/ProbABEL/src/data.cpp
===================================================================
--- branches/ProbABEL-refactoring/ProbABEL/src/data.cpp	2012-11-13 20:58:55 UTC (rev 1021)
+++ branches/ProbABEL-refactoring/ProbABEL/src/data.cpp	2012-11-15 07:45:09 UTC (rev 1022)
@@ -82,7 +82,7 @@
         nlin--; // Subtract one, the previous loop added 1 too much
     } else
     {
-        std::cerr << "mlinfo: cannot open file " << filename << endl;
+        std::cerr << "mlinfo: cannot open info file " << filename << endl;
         exit(1);
     }
     infile.close();
@@ -106,7 +106,7 @@
     infile.open(filename);
     if (!infile)
     { // file couldn't be opened
-        std::cerr << "mlinfo: cannot open file " << filename << endl;
+        std::cerr << "mlinfo: cannot open info file " << filename << endl;
         exit(1);
     }
     /* Read the header and discard it */
@@ -140,7 +140,7 @@
         char line[BFS], tmp[BFS];
         if (!instr.is_open())
         {
-            std::cerr << "mlinfo: cannot open file " << mapname << endl;
+            std::cerr << "mlinfo: cannot open map file " << mapname << endl;
             exit(1);
         }
         instr.getline(line, BFS);