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 a SFINAE friendly iterator_traits and use that instead. #1342

Merged
merged 3 commits into from
Dec 19, 2018
Merged

Add a SFINAE friendly iterator_traits and use that instead. #1342

merged 3 commits into from
Dec 19, 2018

Conversation

dgavedissian
Copy link
Contributor

@dgavedissian dgavedissian commented Nov 7, 2018

Fixes #1341 by implementing our own iterator_traits and using that instead to detect whether a type is an iterator.


Pull request checklist

Read the Contribution Guidelines for detailed information.

  • Changes are described in the pull request, or an existing issue is referenced.
  • The test suite compiles and runs without error.
  • Code coverage is 100%. Test cases can be added by editing the test suite.
  • The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header file single_include/nlohmann/json.hpp. The whole process is described here.

Please don't

  • The C++11 support varies between different compilers and versions. Please note the list of supported compilers. Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with #ifdefs or other means.
  • Specifically, I am aware of compilation problems with Microsoft Visual Studio (there even is an issue label for these kind of bugs). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
  • Please refrain from proposing changes that would break JSON conformance. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
  • Please do not open pull requests that address multiple issues.

@coveralls
Copy link

coveralls commented Nov 7, 2018

Coverage Status

Coverage remained the same at 100.0% when pulling f1080d7 on davedissian:bugfix/sfinae-iterator-traits into d2e6e1b on nlohmann:develop.

@nlohmann
Copy link
Owner

nlohmann commented Dec 8, 2018

@davedissian Could you please have a look at the requested changes?

@dgavedissian
Copy link
Contributor Author

@nlohmann Sorry, yes. Been meaning to get round to it :)

@nlohmann
Copy link
Owner

I think this is ready to merge. @theodelrieu Do you agree?

typedef T value_type;
typedef ptrdiff_t difference_type;
typedef T* pointer;
typedef T& reference;
Copy link
Contributor

Choose a reason for hiding this comment

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

I would prefer using, but that's a minor thing

Copy link
Owner

Choose a reason for hiding this comment

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

I agree. @davedissian could you please make this last change. Then it should be good to go. Thanks!

@theodelrieu
Copy link
Contributor

I added a minor comment, otherwise it looks good to me

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 Dec 18, 2018
@nlohmann nlohmann added this to the Release 3.4.1 milestone Dec 18, 2018
@nlohmann nlohmann merged commit 4f270e3 into nlohmann:develop Dec 19, 2018
@nlohmann
Copy link
Owner

Thanks a lot!

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.

4 participants