[Genabel-commits] r1379 - pkg/VariABEL/src/VARlib

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

Author: maksim
Date: 2013-11-11 18:16:57 +0100 (Mon, 11 Nov 2013)
New Revision: 1379

Modified:
   pkg/VariABEL/src/VARlib/gtps_container.cpp
   pkg/VariABEL/src/VARlib/supplementary_functions.cpp
   pkg/VariABEL/src/VARlib/supplementary_functions.h
Log:
Fixed some remaining WARNINGS and ERRORS from CRAN check report.

Modified: pkg/VariABEL/src/VARlib/gtps_container.cpp
===================================================================
--- pkg/VariABEL/src/VARlib/gtps_container.cpp	2013-11-11 16:34:26 UTC (rev 1378)
+++ pkg/VariABEL/src/VARlib/gtps_container.cpp	2013-11-11 17:16:57 UTC (rev 1379)
@@ -166,7 +166,8 @@
 
 		
 //static const char clear_info_for_person[]={63, 207, 243, 252};
-static const char clear_info_for_person[]={'ÿ', 'Ï', 'ó', 'ü'};
+//static const char clear_info_for_person[]={'ÿ', 'Ï', 'ó', 'ü'};
+static const char clear_info_for_person[]={char(63), char(207), char(243), char(252)};
 
 get_our_byte_number_and_local_person_number(id_position, snp_position);
 

Modified: pkg/VariABEL/src/VARlib/supplementary_functions.cpp
===================================================================
--- pkg/VariABEL/src/VARlib/supplementary_functions.cpp	2013-11-11 16:34:26 UTC (rev 1378)
+++ pkg/VariABEL/src/VARlib/supplementary_functions.cpp	2013-11-11 17:16:57 UTC (rev 1379)
@@ -756,7 +756,7 @@
 
 for(int i=0 ; i<GENO_TYPES_NUM ; i++)
 	{
-  if(snp->COUNTS[i]<=0) continue;
+  if(snp->COUNTS[i]<=0) {continue;}
 	if(unsigned(snp->COUNTS[i]) < threshold)
 		if(exclude_whole_snp)
 			{

Modified: pkg/VariABEL/src/VARlib/supplementary_functions.h
===================================================================
--- pkg/VariABEL/src/VARlib/supplementary_functions.h	2013-11-11 16:34:26 UTC (rev 1378)
+++ pkg/VariABEL/src/VARlib/supplementary_functions.h	2013-11-11 17:16:57 UTC (rev 1379)
@@ -60,7 +60,7 @@
 
 
 
-class snp_var_data;
+struct snp_var_data;
 typedef std::map<std::string, snp_var_data*> Snp_store_type; //use std::string as key because for some reason it doesn't want to work with const char*