From cd783003e3df7b96f94fa403e4873c65a040ae8e Mon Sep 17 00:00:00 2001 From: Jonas Daniel Date: Wed, 15 Jun 2016 12:24:06 +0200 Subject: [PATCH 1/2] Testing cast fix --- src/methCall.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/methCall.cpp b/src/methCall.cpp index 3b646b98..775e333b 100644 --- a/src/methCall.cpp +++ b/src/methCall.cpp @@ -663,7 +663,7 @@ int process_sam ( std::istream *fh, std::string &CpGfile, std::string &CHHfile, { if ( ( ( (int) quals[i] - offset ) < minqual ) || ( mcalls[i] == '.') ){ continue;} std::string key; // initialize the hash key - if( strand == '+') { key = "F|"+ chr+"|"+std::to_string(start+i); } + if( strand == '+') { key = "F|"+ chr+"|"+std::to_string(static_cast(start+i)); } else { key = "R|"+ chr+"|"+std::to_string(start+i); } process_call_string(mcalls,i,key, CGmethHash, nonCGmethHash, CHHmethHash, CHGmethHash); From fc8425358b2cd903e35d3b447bd28aa52faf907b Mon Sep 17 00:00:00 2001 From: Jonas Daniel Date: Wed, 15 Jun 2016 12:28:06 +0200 Subject: [PATCH 2/2] Fix rest cast --- src/methCall.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/methCall.cpp b/src/methCall.cpp index 775e333b..081fc24a 100644 --- a/src/methCall.cpp +++ b/src/methCall.cpp @@ -664,7 +664,7 @@ int process_sam ( std::istream *fh, std::string &CpGfile, std::string &CHHfile, if ( ( ( (int) quals[i] - offset ) < minqual ) || ( mcalls[i] == '.') ){ continue;} std::string key; // initialize the hash key if( strand == '+') { key = "F|"+ chr+"|"+std::to_string(static_cast(start+i)); } - else { key = "R|"+ chr+"|"+std::to_string(start+i); } + else { key = "R|"+ chr+"|"+std::to_string(static_cast(start+i)); } process_call_string(mcalls,i,key, CGmethHash, nonCGmethHash, CHHmethHash, CHGmethHash); @@ -921,8 +921,8 @@ int process_bam ( std::string &input, std::string &CpGfile, std::string &CHHfile { if ( ( ( (int) quals[i] - offset ) < minqual ) || ( mcalls[i] == '.') ){ continue;} std::string key; // initialize the hash key - if( strand == '+') { key = "F|"+ chr+"|"+std::to_string(start+i); } - else { key = "R|"+ chr+"|"+std::to_string(start+i); } + if( strand == '+') { key = "F|"+ chr+"|"+std::to_string(static_cast(start+i)); } + else { key = "R|"+ chr+"|"+std::to_string(static_cast(start+i)); } process_call_string(mcalls,i,key, CGmethHash, nonCGmethHash, CHHmethHash, CHGmethHash); @@ -1100,8 +1100,8 @@ int process_single_bismark (std::istream *fh, std::string &CpGfile, std::string //if last base is a C and it is a part of CCGG motif, don't call for meth if( ( (gbases[i] == 'C') && (i==quals.length()) ) && ( gbases.substr(i-1,4) == "CCGG" ) ) { continue;} std::string key; // initilaize the hash key - if( strand == '+') { key = "F|"+ chr+"|"+std::to_string(start+i); } - else { key = "R|"+ chr+"|"+std::to_string(start+i); } + if( strand == '+') { key = "F|"+ chr+"|"+std::to_string(static_cast(start+i)); } + else { key = "R|"+ chr+"|"+std::to_string(static_cast(start+i)); } process_call_string(mcalls, i,key, CGmethHash, nonCGmethHash, CHHmethHash, CHGmethHash);