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

Fix minor errors on Apple #789

Merged
merged 3 commits into from
Apr 2, 2020
Merged

Conversation

timmah
Copy link
Contributor

@timmah timmah commented Apr 2, 2020

Background

  • Found two minor bugs on Mac builds that result in compilation errors

Purpose of Pull Request

  • Fix those bugs

Description of changes

  • In c4/xthi_cpuset.hh, comment out parameters that are not used in the Apple implementation of sched_getaffinity.
  • In cdi_analytic/test/tstCompound_Analytic_MultigroupOpacity.cc, rename sig_t to sig_test, since the former conflicts with a typedef in Apple's sys/signal.h.

Status

@timmah timmah changed the title Bug fix mac errors Fix minor errors on Apple Apr 2, 2020
@timmah timmah self-assigned this Apr 2, 2020
@timmah timmah added the bug label Apr 2, 2020
@codecov
Copy link

codecov bot commented Apr 2, 2020

Codecov Report

Merging #789 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           develop    #789   +/-   ##
=======================================
  Coverage       94%     94%           
=======================================
  Files          367     367           
  Lines        17229   17229           
=======================================
  Hits         16197   16197           
  Misses        1032    1032

@KineticTheory
Copy link
Collaborator

BTW - nice timing on this PR. It tested changes I made to the regression environment. The snow testing ran with cmake/3.17.0 (related to #788).

@KineticTheory KineticTheory added this to the Draco-7_7_0 milestone Apr 2, 2020
@KineticTheory
Copy link
Collaborator

I marked tests as passing. The reported failures are unrelated to this PR (see #788). We don't have CI that will actually process the first change you made. As long as the code compiles on one machine, I think we are good.

@KineticTheory KineticTheory merged commit 12003bb into lanl:develop Apr 2, 2020
@timmah timmah deleted the bug-fix-mac-errors branch April 2, 2020 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants