From 56947617b8b37b6a15bab2612f065806927aa036 Mon Sep 17 00:00:00 2001 From: Russell Standish Date: Fri, 8 Nov 2024 11:13:19 +1100 Subject: [PATCH] Update classdesc ref. --- classdesc | 2 +- include/nauty.h | 5 ----- include/netcomplexity.h | 9 ++------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/classdesc b/classdesc index 1496b01..dd96d3c 160000 --- a/classdesc +++ b/classdesc @@ -1 +1 @@ -Subproject commit 1496b0116a7289b3006e0974e9b1cb3e55a5bfa9 +Subproject commit dd96d3cdde8161a055ffbf8c42c007113069f80d diff --git a/include/nauty.h b/include/nauty.h index 77122ca..a815245 100644 --- a/include/nauty.h +++ b/include/nauty.h @@ -377,15 +377,10 @@ typedef unsigned long setword; typedef unsigned int setword; #define SETWORD_INT #else -#if SIZEOF_LONG>=8 -typedef unsigned long setword; -#define SETWORD_LONG -#else typedef unsigned long long setword; #define SETWORD_LONGLONG #endif #endif -#endif #endif /* NAUTY_IN_MAGMA else */ diff --git a/include/netcomplexity.h b/include/netcomplexity.h index 7617d6c..7c24676 100644 --- a/include/netcomplexity.h +++ b/include/netcomplexity.h @@ -74,20 +74,15 @@ namespace ecolab #if SIZEOF_INT>=8 typedef unsigned int setword; #define SETWORD_INT -#else -#if SIZEOF_LONG>=8 - typedef unsigned long setword; -#define SETWORD_LONG #else typedef unsigned long long setword; #define SETWORD_LONGLONG #endif #endif -#endif #if (WORDSIZE==64) - const setword MSK64=0xFFFFFFFFFFFFFFFFUL; - const setword MSK63C=0x7FFFFFFFFFFFFFFFUL; + const setword MSK64=0xFFFFFFFFFFFFFFFFULL; + const setword MSK63C=0x7FFFFFFFFFFFFFFFULL; const setword ALLBITS=MSK64; inline unsigned SETWD(unsigned pos) {return pos>>6;} inline unsigned SETBT(unsigned pos) {return pos&0x3F;}