From: westcott <westcott>
Date: Tue, 18 Oct 2011 18:39:07 +0000 (+0000)
Subject: 1.22.0
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=634c19c2ebaa3ea44e3e7e1a580bd79bfef082ed;p=mothur.git

1.22.0
---

diff --git a/addtargets2.cpp b/addtargets2.cpp
index f3f6377..4e0dbd1 100644
--- a/addtargets2.cpp
+++ b/addtargets2.cpp
@@ -1,4 +1,4 @@
-#if	UCHIMES
+//#if	UCHIMES
 
 #include "myutils.h"
 #include "chime.h"
@@ -35,4 +35,4 @@ void AddTargets(SeqDB &DB, const SeqData &Query, set<unsigned> &TargetIndexes)
 		}
 	}
 
-#endif
+//#endif
diff --git a/globalalign2.cpp b/globalalign2.cpp
index 2adfb71..6bb35a9 100644
--- 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
+
+#include "dp.h"
+#include "seq.h"
+
+static AlnParams g_AP;
+static bool g_APInitDone = false;
+
 bool GlobalAlign(const SeqData &Query, const SeqData &Target, PathData &PD)
 	{
 	if (!g_APInitDone)
@@ -42,4 +42,4 @@ bool GlobalAlign(const SeqData &Query, const SeqData &Target, const AlnParams &/
 	return true;
 	}
 
-#endif // UCHIMES
+//#endif // UCHIMES
diff --git a/timing.h b/timing.h
index 0a80aee..b566e1b 100644
--- 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 922dcb4..7afbf42 100644
--- a/usort.cpp
+++ b/usort.cpp
@@ -1,4 +1,4 @@
-#if	UCHIMES
+//#if	UCHIMES
 
 #include "myutils.h"
 #include "seqdb.h"
@@ -83,4 +83,4 @@ void USort(const SeqData &Query, const SeqDB &DB, vector<float> &WordCounts,
 	SortDescending(WordCounts, Order);
 	}
 
-#endif // UCHIMES
+//#endif // UCHIMES