Fixed definition clash

[SXSI/TextCollection.git] / CSA.h

diff --git a/CSA.h b/CSA.h
index e5852b9..4303b53 100644 (file)
--- a/CSA.h
+++ b/CSA.h
@@ -20,18 +20,6 @@
 
 #ifndef _CSA_H_
 #define _CSA_H_
-// Include  from XMLTree/libcds
-#include <basics.h>
-#include <static_bitsequence.h>
-#include <alphabet_mapper.h>
-#include <static_sequence.h>
-
-//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"
@@ -40,6 +28,12 @@
 #include <set>
 #include <vector>
 
+// Include  from XMLTree/libcds
+#include <basics.h>
+#include <static_bitsequence.h>
+#include <alphabet_mapper.h>
+#include <static_sequence.h>
+
 /**
  * Implementation of the TextCollection interface
  *