Merge branch 'develop' into feature/improved_documentation
diff --git a/README.md b/README.md
index 4ad4037..f6b8408 100644
--- a/README.md
+++ b/README.md
@@ -485,6 +485,7 @@
- [Tom Needham](https://github.com/06needhamt) fixed a subtle bug with MSVC 2015 which was also proposed by [Michael K.](https://github.com/Epidal).
- [Mário Feroldi](https://github.com/thelostt) fixed a small typo.
- [duncanwerner](https://github.com/duncanwerner) found a really embarrassing performance regression in the 2.0.0 release.
+- [Damien](https://github.com/dtoma) fixed one of the last conversion warnings.
Thanks a lot for helping out!
diff --git a/src/json.hpp b/src/json.hpp
index cef0f26..079b3a6 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -6006,16 +6006,15 @@
{
// convert a number 0..15 to its hex representation
// (0..f)
- const auto hexify = [](const int v) -> char
+ static const char hexify[16] =
{
- return (v < 10)
- ? ('0' + static_cast<char>(v))
- : ('a' + static_cast<char>((v - 10) & 0x1f));
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
// print character c as \uxxxx
for (const char m :
- { 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f)
+ { 'u', '0', '0', hexify[c >> 4], hexify[c & 0x0f]
})
{
result[++pos] = m;
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index 8ac900c..4ae788e 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -6006,16 +6006,15 @@
{
// convert a number 0..15 to its hex representation
// (0..f)
- const auto hexify = [](const int v) -> char
+ static const char hexify[16] =
{
- return (v < 10)
- ? ('0' + static_cast<char>(v))
- : ('a' + static_cast<char>((v - 10) & 0x1f));
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
// print character c as \uxxxx
for (const char m :
- { 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f)
+ { 'u', '0', '0', hexify[c >> 4], hexify[c & 0x0f]
})
{
result[++pos] = m;
