more fixes, macros conflicts

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

diff --git a/libcds/src/basics.h b/libcds/src/basics.h
index ba792b1..4e00cae 100644 (file)
--- a/libcds/src/basics.h
+++ b/libcds/src/basics.h
@@ -41,9 +41,9 @@ using namespace std;
 #define mask31 0x0000001F
 
 /** max function */
-#define max(x,y) ((x)>(y)?(x):(y))
+//#define max(x,y) ((x)>(y)?(x):(y))
 /** min function */
-#define min(x,y) ((x)<(y)?(x):(y))
+//#define min(x,y) ((x)<(y)?(x):(y))
 
 
 /** number of bits in a uint */

diff --git a/libcds/tests/static_bitsequence_tester.cpp b/libcds/tests/static_bitsequence_tester.cpp
index 8168673..bd801ed 100644 (file)
--- a/libcds/tests/static_bitsequence_tester.cpp
+++ b/libcds/tests/static_bitsequence_tester.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <iostream>
+#include <algorithm>
 #include <sstream>
 #include <basics.h>
 #include <static_bitsequence.h>
@@ -68,8 +69,8 @@ void test_bitsequence(uint * bitseq, uint len, static_bitsequence * bs) {
   for(uint i=0;i<len && !error;i++) {
     //cout << "i="<<i<< endl;
     if(i>0) {
-      if(i%max(1,(bs->length()/100))==0) { cout << "."; cout.flush(); }
-      if(i%max(1,(bs->length()/10))==0) { cout << endl; cout.flush(); }
+      if(i%max((uint)1,(bs->length()/100))==0) { cout << "."; cout.flush(); }
+      if(i%max((uint)1,(bs->length()/10))==0) { cout << endl; cout.flush(); }
     }
     if(bitget(bitseq,i)) ones++;
     if(bs->access(i) != (bitget(bitseq,i)!=0)) {

diff --git a/libcds/tests/static_sequence_tester.cpp b/libcds/tests/static_sequence_tester.cpp
index 01712f8..48906f1 100644 (file)
--- a/libcds/tests/static_sequence_tester.cpp
+++ b/libcds/tests/static_sequence_tester.cpp
@@ -51,8 +51,8 @@ void test_static_sequence(uint * symbols, uint n, static_sequence * ss) {
     occ[i] = 0;
   bool error = false;
   for(uint i=0;i<n && !error;i++) {
-    if(i!=0 && i%max(1,(n-1)/100)==0) { cout << "."; cout.flush(); }
-    if(i!=0 && i%max(1,(n-1)/10)==0) cout << endl;
+    if(i!=0 && i%max((uint)1,(n-1)/100)==0) { cout << "."; cout.flush(); }
+    if(i!=0 && i%max((uint)1,(n-1)/10)==0) cout << endl;
     occ[symbols[i]]++;
     uint a = /*symbols[i]; /*/ss->access(i);
     uint r = /*occ[symbols[i]];/*/ss->rank(symbols[i],i);