Skip to content

Conversation

@jeromekelleher
Copy link
Member

This moves the workaround for the clang bug (#721) from the header file to a C file, to address very good points made by @bhaller. The fix is now local to C code, so we don't need to check for C++ any more, and library users will no longer have this workaround foisted on them unwittingly.

@molpopgen, do you see any problems with doing this?

@jeromekelleher jeromekelleher added this to the C API 0.99.4 milestone Aug 10, 2020
@bhaller
Copy link

bhaller commented Aug 10, 2020

@petrelharp I guess this should be pulled into SLiM once this PR is approved, so I'm tagging you to put it on your radar. :->

@jeromekelleher
Copy link
Member Author

Ended up having to take a different approach here because we used isnan etc in the test suite as well. Same basic outcome though.

Thanks for taking a look @bhaller.

The 0.99.4 version should be tagged in the next day or so, so hopefully we can sync up on that for SLiM.

@codecov
Copy link

codecov bot commented Aug 10, 2020

Codecov Report

Merging #758 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #758   +/-   ##
=======================================
  Coverage   87.69%   87.69%           
=======================================
  Files          24       24           
  Lines       19388    19388           
  Branches     3640     3640           
=======================================
  Hits        17002    17002           
  Misses       1297     1297           
  Partials     1089     1089           
Flag Coverage Δ
#c_tests 85.28% <ø> (ø)
#python_c_tests 90.16% <ø> (ø)
#python_tests 99.02% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
c/tskit/core.h 100.00% <ø> (ø)
c/tskit/tables.c 81.17% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 955c900...5806861. Read the comment docs.

@molpopgen
Copy link
Member

This should be fine.

@jeromekelleher
Copy link
Member Author

@benjeffery, this look good to you?

Copy link
Member

@benjeffery benjeffery left a comment

Choose a reason for hiding this comment

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

LGTM

@mergify mergify bot merged commit 95fca38 into tskit-dev:master Aug 11, 2020
@jeromekelleher jeromekelleher deleted the make-clang-fix-local branch August 11, 2020 11:20
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.

4 participants