Skip to content

Commit

Permalink
fix a "error: ordered comparison between pointer and zero " when comp…
Browse files Browse the repository at this point in the history
…iling with higher clang++ compiler
  • Loading branch information
pierrepeterlongo committed Apr 26, 2019
1 parent 2cc6cb6 commit f696760
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tools/SRC_counter/src/SRC_counter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void SRC_counter::parse_query_sequences (){
void SRC_counter::execute (){
nbCores = getInput()->getInt(STR_CORE);
fingerprint_size = getInput()->getInt(STR_FINGERPRINT);
keep_low_complexity = getInput()->get(STR_KEEP_LOW_COMPLEXITY)>0?true:false;
keep_low_complexity = getInput()->get(STR_KEEP_LOW_COMPLEXITY)?true:false;
gamma_value = getInput()->getInt(STR_GAMMA);
windows_size = getInput()->getInt(STR_WINDOWS_SIZE);
threshold = getInput()->getInt(STR_THRESHOLD);
Expand Down
7 changes: 4 additions & 3 deletions tools/SRC_linker/src/SRC_linker_ram.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ class FunctorQuerySpanKmers // FunctorQuery used after claires discussion: numbe
if (threshold<=0) at_least_one_kmer=true;
std::unordered_set<u_int32_t> similar_read_ids ; // conserve read ids that share enought similarity


int used_windows_size=windows_size;
if (windows_size==0 || windows_size>seq.getDataSize()){ // if windows size == 0 then we use the full read length as windows
used_windows_size=seq.getDataSize();
Expand Down Expand Up @@ -234,6 +233,7 @@ class FunctorQuerySpanKmers // FunctorQuery used after claires discussion: numbe
else print_read_similarities (seq, used_windows_size, similar_read_ids_position);
}
}

private:
void print_read_similarities_dont_check_all (Sequence& seq, std::unordered_set<u_int32_t> similar_read_ids ){
if (similar_read_ids.empty()) return;
Expand Down Expand Up @@ -395,8 +395,9 @@ void SRC_linker_ram::execute (){

threshold = getInput()->getInt(STR_THRESHOLD);
windows_size = getInput()->getInt(STR_WINDOWS_SIZE);
commet_like = getInput()->get(STR_COMMET_LIKE)>0?true:false;
keep_low_complexity = getInput()->get(STR_KEEP_LOW_COMPLEXITY)>0?true:false;
commet_like = getInput()->get(STR_COMMET_LIKE)?true:false;
keep_low_complexity = getInput()->get(STR_KEEP_LOW_COMPLEXITY)?true:false;
cout<<"keep_low_complexity "<<keep_low_complexity<<endl;
create_quasi_dictionary();
fill_quasi_dictionary();

Expand Down

0 comments on commit f696760

Please sign in to comment.