Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
6e1347e6
Commit
6e1347e6
authored
Jul 01, 2016
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #270
parent
814fb31d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
12 deletions
+9
-12
README.md
README.md
+1
-0
src/json.hpp
src/json.hpp
+4
-5
src/json.hpp.re2c
src/json.hpp.re2c
+4
-7
No files found.
README.md
View file @
6e1347e6
...
...
@@ -485,6 +485,7 @@ I deeply appreciate the help of the following people.
-
[
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!
...
...
src/json.hpp
View file @
6e1347e6
...
...
@@ -5957,16 +5957,15 @@ class basic_json
{
// 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
;
...
...
src/json.hpp.re2c
View file @
6e1347e6
...
...
@@ -5957,18 +5957,15 @@ class basic_json
{
// convert a number 0..15 to its hex representation
// (0..f)
const auto hexify = [](const int v) -> char
static const char hexify[16] =
{
static const char hex[16] = { '0', '1', '2', '3',
'4', '5', '6', '7',
'8', '9', 'a', 'b',
'c', 'd', 'e', 'f' };
return hex[v];
'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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment