Less GetText reallocs

[SXSI/TextCollection.git] / CSA.h

diff --git a/CSA.h b/CSA.h
index b9a1745..ec6e890 100644 (file)
--- a/CSA.h
+++ b/CSA.h
@@ -21,6 +21,12 @@
 #ifndef _CSA_H_
 #define _CSA_H_
 #include "dynFMI.h"
+#include "BitRank.h"
+#include "TextCollection.h"
+#include "BlockArray.h"
+#include "RLWaveletTree.h"
+#include <set>
+#include <vector>
 
 // Include  from XMLTree/libcds
 #include <basics.h>
@@ -28,12 +34,14 @@
 #include <alphabet_mapper.h>
 #include <static_sequence.h>
 
-#include <set>
-#include <vector>
-#include "BitRank.h"
-#include "TextCollection.h"
-#include "BlockArray.h"
-#include "RLWaveletTree.h"
+// Re-define word size to ulong:
+#undef W
+#if __WORDSIZE == 64
+#   define W 64
+#else
+#   define W 32
+#endif
+
 
 /**
  * Implementation of the TextCollection interface