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 GCC 7.1.1 - 7.2.1 on CentOS #1496

Merged
merged 1 commit into from
Mar 10, 2019
Merged

fix GCC 7.1.1 - 7.2.1 on CentOS #1496

merged 1 commit into from
Mar 10, 2019

Conversation

lieff
Copy link
Contributor

@lieff lieff commented Feb 25, 2019

Closes #670

I've checked also gcc 5.5 and 8.1 and seems fix do not breaks anything.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 7b31e56 on lieff:develop into 21516f2 on nlohmann:develop.

@lieff
Copy link
Contributor Author

lieff commented Feb 26, 2019

Also may be cleanup redundant check (defined(_MSC_VER) and _MSC_VER <= 1914) ?

#ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
                   and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
#if defined(JSON_HAS_CPP_17) && defined(__GNUC__)
                   and not std::is_same<ValueType, typename std::string_view>::value
#endif
#endif

Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@nlohmann nlohmann self-assigned this Mar 10, 2019
@nlohmann nlohmann added this to the Release 3.6.0 milestone Mar 10, 2019
@nlohmann nlohmann merged commit 30edcaa into nlohmann:develop Mar 10, 2019
@nlohmann
Copy link
Owner

Thanks!

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.

Operator= ambiguous in C++1z and GCC 7.1.1
3 participants