[Genabel-commits] r1732 - pkg/ProbABEL/src

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

Author: lckarssen
Date: 2014-05-19 18:58:46 +0200 (Mon, 19 May 2014)
New Revision: 1732

Modified:
   pkg/ProbABEL/src/gendata.cpp
Log:
Changed the way the raw strings were split across multiple lines. cpplint wasn't happy with the way I did it in r1731.



Modified: pkg/ProbABEL/src/gendata.cpp
===================================================================
--- pkg/ProbABEL/src/gendata.cpp	2014-05-19 15:18:19 UTC (rev 1731)
+++ pkg/ProbABEL/src/gendata.cpp	2014-05-19 16:58:46 UTC (rev 1732)
@@ -41,9 +41,10 @@
                                     const int amount_of_numbers){
     int j = 0;
     // Check if not a null pointer
-    if (!*all_numbers){
-        perror("Error while reading genetic data (expected pointer to char\
- but found a null pointer)");
+//    if (!*all_numbers){
+    if (true) {
+        perror("Error while reading genetic data (expected pointer to char "
+               "but found a null pointer)");
         exit(EXIT_FAILURE);
     }
 
@@ -217,10 +218,9 @@
         // fix thanks to Vadym Pinchuk
         if (allmeasured[i] && idnames[j] != DAGobsname)
         {
-            report_error(
-                "names do not match for observation at phenofile line\
- (phe/geno) %i/+1 (%s/%s)\n",
-                i + 1, idnames[j].c_str(), DAGobsname.c_str());
+            report_error("names do not match for observation at phenofile "
+                         "line (phe/geno) %i/+1 (%s/%s)\n",
+                         i + 1, idnames[j].c_str(), DAGobsname.c_str());
         }
     }
     nids = j + 1;