Fixed W definitions

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/TextCollection@156 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/CSA.h b/CSA.h
index b9a1745..e5852b9 100644 (file)
--- a/CSA.h
+++ b/CSA.h
@@ -20,20 +20,25 @@
 
 #ifndef _CSA_H_
 #define _CSA_H_
-#include "dynFMI.h"
-
 // Include  from XMLTree/libcds
 #include <basics.h>
 #include <static_bitsequence.h>
 #include <alphabet_mapper.h>
 #include <static_sequence.h>
 
-#include <set>
-#include <vector>
+//clash between TextCollection/Tools.h and libcds/includes/basics.h
+// Number of bits in ulong vs uint.
+#undef W
+#undef WW
+#undef Wminusone
+
+#include "dynFMI.h"
 #include "BitRank.h"
 #include "TextCollection.h"
 #include "BlockArray.h"
 #include "RLWaveletTree.h"
+#include <set>
+#include <vector>
 
 /**
  * Implementation of the TextCollection interface