1.22.0

diff --git a/addtargets2.cpp b/addtargets2.cpp
index f3f637755027799ae9c2a2971dfaa24bb81b56e4..4e0dbd1fea24d32885e00b3e83b62690d6c8065b 100644 (file)
--- a/addtargets2.cpp
+++ b/addtargets2.cpp
@@ -1,4 +1,4 @@
-#if    UCHIMES\r
+//#if  UCHIMES\r
 \r
 #include "myutils.h"\r
 #include "chime.h"\r
@@ -35,4 +35,4 @@ void AddTargets(SeqDB &DB, const SeqData &Query, set<unsigned> &TargetIndexes)
                }\r
        }\r
 \r
-#endif\r
+//#endif\r

diff --git a/globalalign2.cpp b/globalalign2.cpp
index 2adfb719ba21f0d33227eaad6d61e6b6452f0e70..6bb35a910737c2511b950625f750ef2dd363ded0 100644 (file)
--- a/globalalign2.cpp
+++ b/globalalign2.cpp
@@ -1,11 +1,11 @@
-#if    UCHIMES
-
-#include "dp.h"
-#include "seq.h"
-
-static AlnParams g_AP;
-static bool g_APInitDone = false;
-
+//#if  UCHIMES\r
+\r
+#include "dp.h"\r
+#include "seq.h"\r
+\r
+static AlnParams g_AP;\r
+static bool g_APInitDone = false;\r
+\r
 bool GlobalAlign(const SeqData &Query, const SeqData &Target, PathData &PD)\r
        {\r
        if (!g_APInitDone)\r
@@ -42,4 +42,4 @@ bool GlobalAlign(const SeqData &Query, const SeqData &Target, const AlnParams &/
        return true;\r
        }\r
 \r
-#endif // UCHIMES\r
+//#endif // UCHIMES\r

diff --git a/timing.h b/timing.h
index 0a80aee10aec83e3521d7e35642489afc91392f8..b566e1b801a932374736991076457f0efd9dda4c 100644 (file)
--- a/timing.h
+++ b/timing.h
@@ -9,10 +9,10 @@
 #define BG_TIMING      0
 #endif
 
-#if    UCHIMES
+//#if  UCHIMES
 #undef TIMING
 #define TIMING 0
-#endif
+//#endif
 
 #if TIMING
 

diff --git a/usort.cpp b/usort.cpp
index 922dcb4a08ad3d26b5943d730a05d57bb5bafa5a..7afbf4279bb23aafdffdd474cdf7185ab226b6af 100644 (file)
--- a/usort.cpp
+++ b/usort.cpp
@@ -1,4 +1,4 @@
-#if    UCHIMES\r
+//#if  UCHIMES\r
 \r
 #include "myutils.h"\r
 #include "seqdb.h"\r
@@ -83,4 +83,4 @@ void USort(const SeqData &Query, const SeqDB &DB, vector<float> &WordCounts,
        SortDescending(WordCounts, Order);\r
        }\r
 \r
-#endif // UCHIMES\r
+//#endif // UCHIMES\r