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

Compilation fixes #417

Merged
merged 2 commits into from Dec 6, 2018

Conversation

Projects
None yet
4 participants
@SteVwonder
Copy link
Member

SteVwonder commented Dec 6, 2018

Solves two common compilations currently affecting master.

Fixes #404
Fixes #416

@SteVwonder SteVwonder requested review from dongahn and trws Dec 6, 2018

Show resolved Hide resolved resource/modules/Makefile.am Outdated
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Dec 6, 2018

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #417   +/-   ##
=======================================
  Coverage   75.53%   75.53%           
=======================================
  Files          67       67           
  Lines       10831    10831           
=======================================
  Hits         8181     8181           
  Misses       2650     2650
Impacted Files Coverage Δ
resource/policies/base/matcher.cpp 73.21% <ø> (ø) ⬆️

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 aef18a9...fc748aa. Read the comment docs.

@trws

This comment has been minimized.

Copy link
Member

trws commented Dec 6, 2018

@SteVwonder

This comment has been minimized.

Copy link
Member Author

SteVwonder commented Dec 6, 2018

Ah, if it’s superfluous then having all boost references come out is fine, I was mainly worried that it might lose the header search path information.

It actually appears that boost functions (i.e., get) are being used in the resource_match module. So maybe those lines aren't superfluous and the error is instead that resource_match needs to add an include of boost (compilation is probably succeeding b/c resource_match is picking up boost via an indirect include).

Let me add those lines back in.

SteVwonder added some commits Nov 9, 2018

automake: move BOOST_LDFLAGS into *_LDADD
also remove boost flags from resource matching service module
resource: resolve undefined remove_if
include <algorithm> header

@SteVwonder SteVwonder force-pushed the SteVwonder:compilation-fixes branch from a59947e to fc748aa Dec 6, 2018

@dongahn

This comment has been minimized.

Copy link
Contributor

dongahn commented Dec 6, 2018

Looks good. Ready to go in?

@SteVwonder

This comment has been minimized.

Copy link
Member Author

SteVwonder commented Dec 6, 2018

It's ready on my end.

@dongahn dongahn merged commit 70bf109 into flux-framework:master Dec 6, 2018

3 checks passed

codecov/patch Coverage not affected when comparing aef18a9...fc748aa
Details
codecov/project 75.53% remains the same compared to aef18a9
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@dongahn

This comment has been minimized.

Copy link
Contributor

dongahn commented Dec 6, 2018

Thank you @SteVwonder!

@SteVwonder

This comment has been minimized.

Copy link
Member Author

SteVwonder commented Dec 6, 2018

Thanks @dongahn & @trws!

@SteVwonder SteVwonder deleted the SteVwonder:compilation-fixes branch Dec 6, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.