Fixed definition clash

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

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
  *

diff --git a/testTextCollection.cpp b/testTextCollection.cpp
index dfa618e..59b6b43 100644 (file)
--- a/testTextCollection.cpp
+++ b/testTextCollection.cpp
@@ -2,13 +2,13 @@
 #include <iostream>
 #include <cstdlib>
 #include <string>
-#include "HeapProfiler.h"
 using std::cout;
 using std::endl;
 using std::cin;
 using std::string;
 
 #include "TextCollection.h"
+#include "HeapProfiler.h"
 using SXSI::TextCollection;
 
 void printDocumentResult(TextCollection::document_result dr)