Skip to content

#550 Fix iterator related compiling issues for Intel icc - #598

Merged
nlohmann merged 8 commits into
nlohmann:developfrom
HenryRLee:issue550
Jun 6, 2017
Merged

nlohmann merged 8 commits into
nlohmann:developfrom
HenryRLee:issue550

Conversation

@HenryRLee

Copy link
Copy Markdown
Contributor

Currently there are two know issues when compiling with Intel icc:

  1. The operator() in iterator causes warning
  2. The use of internal_iterator causes error

The first issue can be resolved by replacing the operator() with a converting constructor and assignment. Because the existence of the copy constructor may bring ambiguity, I removed it and the copy constructor will be defined implicitly.

The second issue is fixed by adding a struct keyword in front of the type name.

@HenryRLee HenryRLee changed the title Issue550 Fix iterator related compiling issues for Intel icc #550 Fix iterator related compiling issues for Intel icc May 30, 2017
@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.0006%) to 99.72% when pulling 881cd3f on HenryRLee:issue550 into 52adf3f on nlohmann:develop.

@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.0006%) to 99.72% when pulling 0a51fb2 on HenryRLee:issue550 into 52adf3f on nlohmann:develop.

@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.0006%) to 99.72% when pulling f2e1643 on HenryRLee:issue550 into 52adf3f on nlohmann:develop.

@nlohmann

nlohmann commented Jun 5, 2017

Copy link
Copy Markdown
Owner

@HenryRLee Could you please merge the current develop branch so the AppVeyor tests have a chance to succeed?

@HenryRLee

Copy link
Copy Markdown
Contributor Author

Sure. It's updated now. Testing on the way.

@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.0006%) to 99.72% when pulling 2ba554e on HenryRLee:issue550 into 1a9d766 on nlohmann:develop.

@nlohmann nlohmann left a comment

Copy link
Copy Markdown
Owner

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 Jun 6, 2017
@nlohmann nlohmann added this to the Release 3.0.0 milestone Jun 6, 2017
@nlohmann
nlohmann merged commit bfdf0d1 into nlohmann:develop Jun 6, 2017
@nlohmann

nlohmann commented Jun 6, 2017

Copy link
Copy Markdown
Owner

Thanks!

nlohmann added a commit that referenced this pull request Jun 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants