Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid using SIZEOF_VOID_P, remove unsused SYS_IS_CYGWIN32 #502

Merged
merged 1 commit into from
Oct 27, 2021

Conversation

fingolfin
Copy link
Contributor

This allows future GAP versions to drop SIZEOF_VOID_P (although 4.12
definitely will support it).

// The following macro is bitmap_decode_ctz_callpack from https://git.io/fho4p
#ifdef DIGRAPHS_HAVE___BUILTIN_CTZLL
#if SYS_IS_64_BIT && defined(DIGRAPHS_HAVE___BUILTIN_CTZLL)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should point out that this check (and also the one it replaces) does not seem to fit the code it wraps 100%: I think what you really need to check is whether sizeof(unsigned long long) == 8, and then use unsigned long long instead of uin64_t below (as uint64_t may be long, not long long, which is technically a different type, even if it has the same size as long). Anyway, it probably doesn't matter in practice on most systems, and I didn't want to make a semantic change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean, I'd be happy to accept a PR that made this change, or to make this change myself.

This allows future GAP versions to drop SIZEOF_VOID_P (although 4.12
definitely will support it).
@fingolfin fingolfin force-pushed the mh/avoid-SIZEOF_VOID_P branch from 698f69f to 3f5cce2 Compare October 17, 2021 19:37
@fingolfin
Copy link
Contributor Author

Those CI failures don't seem to be caused by this PR?

E: The repository 'http://www.math.uiuc.edu/Macaulay2/Repositories/Ubuntu bionic Release' no longer has a Release file.

@wilfwilson
Copy link
Collaborator

Thanks for the PR @fingolfin and the comment, yes the CI failure is surely unrelated to your PR.

@james-d-mitchell
Copy link
Member

Thanks for the PR @fingolfin, much appreciated. I'm happy enough to merge this, and agree it doesn't seem to be the fault of this PR that the CI is failing.

@james-d-mitchell
Copy link
Member

Those CI failures don't seem to be caused by this PR?

E: The repository 'http://www.math.uiuc.edu/Macaulay2/Repositories/Ubuntu bionic Release' no longer has a Release file.

Looking at this a bit further, I think this is caused by the following line:

https://github.com/gap-system/gap-docker-base/blob/f18e5899d0106e0575a7e37ee823b6f4d0196a81/Dockerfile#L130

in the gap-system/gap-docker-base repo. The failing CI job for Digraphs uses the gap-docker-master docker container. I'm not sure if this is a bug in the gap-docker-base, or not, probably I should report it there? Any advice? @fingolfin @wilfwilson

@wilfwilson
Copy link
Collaborator

wilfwilson commented Oct 27, 2021

@james-d-mitchell I really don't know the first thing about Docker, sorry. I think opening the issue that you did is your best bet. For now I'd be happy for us to merge PRs where the 64-bit/GAP master/latest packages job is the only failing one.

@wilfwilson wilfwilson merged commit 9be09de into digraphs:stable-1.4 Oct 27, 2021
@fingolfin fingolfin deleted the mh/avoid-SIZEOF_VOID_P branch October 31, 2021 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants