Merge branch 'develop' into feature/json-pointer

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

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->());
}