used enum INTERIM_FILTER_FULL for older compilers

soedinglab · Jul 21, 2016 · 4db0185 · 4db0185
1 parent 131f18e
commit 4db0185
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/hhblits.cpp b/src/hhblits.cpp
@@ -857,9 +857,9 @@ void HHblits::ProcessArguments(int argc, char** argv, Parameters& par) {
         exit(4);
       } else {
         if(!strcmp(argv[i], "NONE")) {
-          par.interim_filter = InterimFilterStates::NONE;
+          par.interim_filter = INTERIM_FILTER_NONE;
         } else if(!strcmp(argv[i], "FULL")) {
-          par.interim_filter = InterimFilterStates::FULL;
+          par.interim_filter = INTERIM_FILTER_FULL;
         } else {
           help(par);
           HH_LOG(ERROR) << "No state out of NONE|FULL following -interim_filter" << std::endl;
@@ -915,7 +915,7 @@ void HHblits::mergeHitsToQuery(Hash<Hit>* previous_hits,
     Tali.N_filtered = Tali.Filter(par.max_seqid_db, S, par.coverage_db,
                                   par.qid_db, par.qsc_db, par.Ndiff_db);
 
-    if(par.interim_filter != InterimFilterStates::NONE && Tali.N_filtered + Qali->N_in >= MAXSEQ) {
+    if(par.interim_filter == INTERIM_FILTER_FULL && Tali.N_filtered + Qali->N_in >= MAXSEQ) {
   	  Qali->N_filtered = Qali->Filter(par.max_seqid, S, cov_tot, par.qid, par.qsc, par.Ndiff);
       Qali->Shrink();
     }

diff --git a/src/hhdecl.cpp b/src/hhdecl.cpp
@@ -224,7 +224,7 @@ void Parameters::SetDefaults() {
 	threads = 2;
 	nocontxt = false;
 
-	interim_filter = InterimFilterStates::FULL;
+	interim_filter = InterimFilterStates::INTERIM_FILTER_FULL;
 }
 
 Parameters::Parameters() {

diff --git a/src/hhdecl.h b/src/hhdecl.h
@@ -110,7 +110,7 @@ const pair_states MI = pair_states(DEPRECATED_MI);
 
 
 //states for the interim filter of the query msa during merging
-enum InterimFilterStates {NONE=0, FULL=1};
+enum InterimFilterStates {INTERIM_FILTER_NONE=0, INTERIM_FILTER_FULL=1};
 
 #include "util.h"
 #include "hhdatabase.h"