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

Add ciso646 header to get _LIBCPP_VERSION for testing inplace merge #3095

Merged
merged 1 commit into from Jan 10, 2018

Conversation

msimberg
Copy link
Contributor

@msimberg msimberg commented Jan 8, 2018

Fixes #2964

Proposed Changes

  • Add include to stable_inplace_merge cmake test so that _LIBCPP_VERSION is defined
  • Fix version comparison

Any background context you want to provide?

I left out out some crucial parts in #3078. This fixes them.

Copy link
Member

@hkaiser hkaiser left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@msimberg msimberg merged commit d8d19f8 into STEllAR-GROUP:master Jan 10, 2018
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.

parallel merge is not stable
2 participants