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

Move generic flags to core.h #2230

Merged
merged 1 commit into from
Apr 28, 2022
Merged

Conversation

benjeffery
Copy link
Member

Fixes #2218
Instead of moving to trees.h it seemed to make more sense to move all the generic flags to core.h then all flags in other files should be namespaced to a function.

Copy link
Member

@jeromekelleher jeromekelleher left a comment

Choose a reason for hiding this comment

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

LGTM, one tweak suggested

c/tskit/core.h Outdated

/** @brief Instead of taking a copy of input data, take ownership of it
* and its lifecycle */
#define TSK_TAKE_OWNERSHIP (1 << 28)
Copy link
Member

Choose a reason for hiding this comment

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

Might as well make this (1u << 28). Probably makes no difference, but saves future readers wondering why its different to others.

@benjeffery benjeffery added the AUTOMERGE-REQUESTED Ask Mergify to merge this PR label Apr 28, 2022
@codecov
Copy link

codecov bot commented Apr 28, 2022

Codecov Report

Merging #2230 (6bf0ce2) into main (51badd4) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2230   +/-   ##
=======================================
  Coverage   93.29%   93.29%           
=======================================
  Files          27       27           
  Lines       25994    25994           
  Branches     1165     1165           
=======================================
  Hits        24251    24251           
  Misses       1713     1713           
  Partials       30       30           
Flag Coverage Δ
c-tests 92.20% <ø> (ø)
lwt-tests 89.05% <ø> (ø)
python-c-tests 72.06% <ø> (ø)
python-tests 98.87% <ø> (ø)

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

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

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 51badd4...6bf0ce2. Read the comment docs.

@mergify mergify bot merged commit 009d45b into tskit-dev:main Apr 28, 2022
@mergify mergify bot removed the AUTOMERGE-REQUESTED Ask Mergify to merge this PR label Apr 28, 2022
@benjeffery benjeffery deleted the generic_flags branch April 28, 2022 21:03
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.

Move flags for tree functions to tree.h
2 participants