Merge branch 'develop' into feature/json-pointer

This commit is contained in:
Niels committed 2016-04-16 12:19:31 +02:00
commit 3a3e064287
5 files changed
+412 -431

No files matched your search

+395 -426
View File
File diff suppressed because it is too large. Load diff
+2 -2
View File
@@ -7000,13 +7000,13 @@ class basic_json
}
/// return a reference to the value pointed to by the iterator
reference operator*()
reference operator*() const
{
return const_cast<reference>(base_iterator::operator*());
}
/// dereference the iterator
pointer operator->()
pointer operator->() const
{
return const_cast<pointer>(base_iterator::operator->());
}