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

Merged

nlohmann merged 8 commits into

nlohmann:developfrom

HenryRLee:issue550

Jun 6, 2017

Commits on May 30, 2017

Add converting constructors for iterator
HenryRLee
committed
ce39330
Add struct keyword in front of internal_iterator
HenryRLee
committed
790e7ca
Remove the iter_impl<const basic_json> copy constructor and copy assignment
HenryRLee
committed
881cd3f
Fix indentation
HenryRLee
committed
0a51fb2
Add test cases for iterator to const iterator conversion
HenryRLee
committed
c09a4cb
Redefine the converting assignment in iterator
HenryRLee
committed
2d5f0c0
Add test cases for iterator to const iterator assignment
HenryRLee
committed
f2e1643

Commits on Jun 5, 2017

Merge branch 'develop' into issue550
HenryRLee
committed
2ba554e