X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=libcds%2Fsrc%2Fbasics.h;h=4e00cae3ab5bbb8698d97d91eb466c9c2a8beea5;hb=f1065079810ebe519367f7399edb68307c789b41;hp=39cb81be5d9df432a266f5ceec206572ee8a6b23;hpb=9e8d96bc2eea5ec6ee7c9d4bb9b83315b9687c02;p=SXSI%2FXMLTree.git

diff --git a/libcds/src/basics.h b/libcds/src/basics.h
index 39cb81b..4e00cae 100644
--- a/libcds/src/basics.h
+++ b/libcds/src/basics.h
@@ -41,25 +41,22 @@ 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 */
-#ifndef W
+#undef W
 #define W 32
-#endif
 
 /** W-1 */
-#ifndef Wminusone
+#undef Wminusone
 #define Wminusone 31
-#endif
 
 /** 2W*/
-#ifndef WW
+#undef WW
 #define WW 64
-#endif
 
 /** number of bits per uchar */
 #define bitsM 8