added change from #140

This commit is contained in:
Niels 2015-12-07 21:05:21 +01:00
parent 72476b4226
commit 22bc022745
3 changed files with 9 additions and 4 deletions

View file

@ -382,6 +382,7 @@ I deeply appreciate the help of the following people.
- [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support. - [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support.
- [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK. - [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK.
- [Eau Claire](https://github.com/whackashoe) replaced a function that was marked as unsafe by Visual Studio. - [Eau Claire](https://github.com/whackashoe) replaced a function that was marked as unsafe by Visual Studio.
- [406345](https://github.com/406345) fixed two small warnings.
Thanks a lot for helping out! Thanks a lot for helping out!

View file

@ -4703,7 +4703,9 @@ class basic_json
}; };
// print character c as \uxxxx // print character c as \uxxxx
for(const char m : { 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f) }) for (const char m :
{ 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f)
})
{ {
result[++pos] = m; result[++pos] = m;
} }
@ -4937,7 +4939,7 @@ class basic_json
static constexpr difference_type end_value = begin_value + 1; static constexpr difference_type end_value = begin_value + 1;
/// iterator as signed integer type /// iterator as signed integer type
difference_type m_it = std::numeric_limits<std::ptrdiff_t>::min(); difference_type m_it = std::numeric_limits<std::ptrdiff_t>::denorm_min();
}; };
/*! /*!

View file

@ -4703,7 +4703,9 @@ class basic_json
}; };
// print character c as \uxxxx // print character c as \uxxxx
for(const char m : { 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f) }) for (const char m :
{ 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f)
})
{ {
result[++pos] = m; result[++pos] = m;
} }
@ -4937,7 +4939,7 @@ class basic_json
static constexpr difference_type end_value = begin_value + 1; static constexpr difference_type end_value = begin_value + 1;
/// iterator as signed integer type /// iterator as signed integer type
difference_type m_it = std::numeric_limits<std::ptrdiff_t>::min(); difference_type m_it = std::numeric_limits<std::ptrdiff_t>::denorm_min();
}; };
/*! /*!