From faf1265bb82f934cc14b6106ccce89e37203efbd Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Thu, 2 Nov 2006 08:01:00 -0800 Subject: Version abc61102 --- src/map/mapper/mapper.h | 8 ++++---- src/map/mapper/mapperInt.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/map/mapper') diff --git a/src/map/mapper/mapper.h b/src/map/mapper/mapper.h index 10839382..8eade761 100644 --- a/src/map/mapper/mapper.h +++ b/src/map/mapper/mapper.h @@ -63,10 +63,10 @@ struct Map_TimeStruct_t_ /// MACRO DEFINITIONS /// //////////////////////////////////////////////////////////////////////// -#define Map_IsComplement(p) (((int)((long) (p) & 01))) -#define Map_Regular(p) ((Map_Node_t *)((unsigned)(p) & ~01)) -#define Map_Not(p) ((Map_Node_t *)((long)(p) ^ 01)) -#define Map_NotCond(p,c) ((Map_Node_t *)((long)(p) ^ (c))) +#define Map_IsComplement(p) (((int)((unsigned long) (p) & 01))) +#define Map_Regular(p) ((Map_Node_t *)((unsigned long)(p) & ~01)) +#define Map_Not(p) ((Map_Node_t *)((unsigned long)(p) ^ 01)) +#define Map_NotCond(p,c) ((Map_Node_t *)((unsigned long)(p) ^ (c))) //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// diff --git a/src/map/mapper/mapperInt.h b/src/map/mapper/mapperInt.h index a3a2cf40..37cca3d3 100644 --- a/src/map/mapper/mapperInt.h +++ b/src/map/mapper/mapperInt.h @@ -61,10 +61,10 @@ #define MAP_RANDOM_UNSIGNED ((((unsigned)rand()) << 24) ^ (((unsigned)rand()) << 12) ^ ((unsigned)rand())) // internal macros to work with cuts -#define Map_CutIsComplement(p) (((int)((long) (p) & 01))) -#define Map_CutRegular(p) ((Map_Cut_t *)((unsigned)(p) & ~01)) -#define Map_CutNot(p) ((Map_Cut_t *)((long)(p) ^ 01)) -#define Map_CutNotCond(p,c) ((Map_Cut_t *)((long)(p) ^ (c))) +#define Map_CutIsComplement(p) (((int)((unsigned long) (p) & 01))) +#define Map_CutRegular(p) ((Map_Cut_t *)((unsigned long)(p) & ~01)) +#define Map_CutNot(p) ((Map_Cut_t *)((unsigned long)(p) ^ 01)) +#define Map_CutNotCond(p,c) ((Map_Cut_t *)((unsigned long)(p) ^ (c))) // internal macros for referencing of nodes #define Map_NodeReadRef(p) ((Map_Regular(p))->nRefs) -- cgit v1.2.3