more fixes, macros conflicts

[SXSI/XMLTree.git] / libcds / src / basics.h

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 */