Skip to content

Commit 5694761

Browse files
Update classdesc ref.
1 parent 4f8e1aa commit 5694761

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

classdesc

include/nauty.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -377,15 +377,10 @@ typedef unsigned long setword;
377377
typedef unsigned int setword;
378378
#define SETWORD_INT
379379
#else
380-
#if SIZEOF_LONG>=8
381-
typedef unsigned long setword;
382-
#define SETWORD_LONG
383-
#else
384380
typedef unsigned long long setword;
385381
#define SETWORD_LONGLONG
386382
#endif
387383
#endif
388-
#endif
389384

390385
#endif /* NAUTY_IN_MAGMA else */
391386

include/netcomplexity.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,15 @@ namespace ecolab
7474
#if SIZEOF_INT>=8
7575
typedef unsigned int setword;
7676
#define SETWORD_INT
77-
#else
78-
#if SIZEOF_LONG>=8
79-
typedef unsigned long setword;
80-
#define SETWORD_LONG
8177
#else
8278
typedef unsigned long long setword;
8379
#define SETWORD_LONGLONG
8480
#endif
8581
#endif
86-
#endif
8782

8883
#if (WORDSIZE==64)
89-
const setword MSK64=0xFFFFFFFFFFFFFFFFUL;
90-
const setword MSK63C=0x7FFFFFFFFFFFFFFFUL;
84+
const setword MSK64=0xFFFFFFFFFFFFFFFFULL;
85+
const setword MSK63C=0x7FFFFFFFFFFFFFFFULL;
9186
const setword ALLBITS=MSK64;
9287
inline unsigned SETWD(unsigned pos) {return pos>>6;}
9388
inline unsigned SETBT(unsigned pos) {return pos&0x3F;}

0 commit comments

Comments
 (0)