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
6d73126e
Unverified
Commit
6d73126e
authored
Jun 07, 2020
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🚨
fix warnings
parent
28048d82
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/input/input_adapters.hpp
+6
-6
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/input/lexer.hpp
+3
-3
No files found.
include/nlohmann/detail/input/input_adapters.hpp
View file @
6d73126e
...
@@ -247,15 +247,15 @@ struct wide_string_input_helper<BaseInputAdapter, 2>
...
@@ -247,15 +247,15 @@ struct wide_string_input_helper<BaseInputAdapter, 2>
}
}
else
if
(
wc
<=
0x7FF
)
else
if
(
wc
<=
0x7FF
)
{
{
utf8_bytes
[
0
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0xC0u
|
((
wc
>>
6u
)));
utf8_bytes
[
0
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0xC0u
|
((
static_cast
<
unsigned
int
>
(
wc
)
>>
6u
)));
utf8_bytes
[
1
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
(
wc
&
0x3Fu
));
utf8_bytes
[
1
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
(
static_cast
<
unsigned
int
>
(
wc
)
&
0x3Fu
));
utf8_bytes_filled
=
2
;
utf8_bytes_filled
=
2
;
}
}
else
if
(
0xD800
>
wc
or
wc
>=
0xE000
)
else
if
(
0xD800
>
wc
or
wc
>=
0xE000
)
{
{
utf8_bytes
[
0
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0xE0u
|
((
wc
>>
12u
)));
utf8_bytes
[
0
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0xE0u
|
((
static_cast
<
unsigned
int
>
(
wc
)
>>
12u
)));
utf8_bytes
[
1
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
((
wc
>>
6u
)
&
0x3Fu
));
utf8_bytes
[
1
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
((
static_cast
<
unsigned
int
>
(
wc
)
>>
6u
)
&
0x3Fu
));
utf8_bytes
[
2
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
(
wc
&
0x3Fu
));
utf8_bytes
[
2
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
(
static_cast
<
unsigned
int
>
(
wc
)
&
0x3Fu
));
utf8_bytes_filled
=
3
;
utf8_bytes_filled
=
3
;
}
}
else
else
...
@@ -263,7 +263,7 @@ struct wide_string_input_helper<BaseInputAdapter, 2>
...
@@ -263,7 +263,7 @@ struct wide_string_input_helper<BaseInputAdapter, 2>
if
(
JSON_HEDLEY_UNLIKELY
(
not
input
.
empty
()))
if
(
JSON_HEDLEY_UNLIKELY
(
not
input
.
empty
()))
{
{
const
auto
wc2
=
static_cast
<
unsigned
int
>
(
input
.
get_character
());
const
auto
wc2
=
static_cast
<
unsigned
int
>
(
input
.
get_character
());
const
auto
charcode
=
0x10000u
+
(((
wc
&
0x3FFu
)
<<
10u
)
|
(
wc2
&
0x3FFu
));
const
auto
charcode
=
0x10000u
+
(((
static_cast
<
unsigned
int
>
(
wc
)
&
0x3FFu
)
<<
10u
)
|
(
wc2
&
0x3FFu
));
utf8_bytes
[
0
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0xF0u
|
(
charcode
>>
18u
));
utf8_bytes
[
0
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0xF0u
|
(
charcode
>>
18u
));
utf8_bytes
[
1
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
((
charcode
>>
12u
)
&
0x3Fu
));
utf8_bytes
[
1
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
((
charcode
>>
12u
)
&
0x3Fu
));
utf8_bytes
[
2
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
((
charcode
>>
6u
)
&
0x3Fu
));
utf8_bytes
[
2
]
=
static_cast
<
std
::
char_traits
<
char
>::
int_type
>
(
0x80u
|
((
charcode
>>
6u
)
&
0x3Fu
));
...
...
include/nlohmann/detail/input/lexer.hpp
View file @
6d73126e
...
@@ -113,7 +113,7 @@ class lexer : public lexer_base<BasicJsonType>
...
@@ -113,7 +113,7 @@ class lexer : public lexer_base<BasicJsonType>
using
token_type
=
typename
lexer_base
<
BasicJsonType
>::
token_type
;
using
token_type
=
typename
lexer_base
<
BasicJsonType
>::
token_type
;
explicit
lexer
(
InputAdapterType
&&
adapter
)
explicit
lexer
(
InputAdapterType
&&
adapter
)
:
ia
(
std
::
move
(
adapter
)),
decimal_point_char
(
static_cast
<
char_type
>
(
get_decimal_point
()))
{}
:
ia
(
std
::
move
(
adapter
)),
decimal_point_char
(
static_cast
<
char_
int_
type
>
(
get_decimal_point
()))
{}
// delete because of pointer members
// delete because of pointer members
lexer
(
const
lexer
&
)
=
delete
;
lexer
(
const
lexer
&
)
=
delete
;
...
@@ -1218,7 +1218,7 @@ scan_number_done:
...
@@ -1218,7 +1218,7 @@ scan_number_done:
token_type
scan_literal
(
const
char_type
*
literal_text
,
const
std
::
size_t
length
,
token_type
scan_literal
(
const
char_type
*
literal_text
,
const
std
::
size_t
length
,
token_type
return_type
)
token_type
return_type
)
{
{
assert
(
current
==
literal_text
[
0
]);
assert
(
std
::
char_traits
<
char_type
>::
to_char_type
(
current
)
==
literal_text
[
0
]);
for
(
std
::
size_t
i
=
1
;
i
<
length
;
++
i
)
for
(
std
::
size_t
i
=
1
;
i
<
length
;
++
i
)
{
{
if
(
JSON_HEDLEY_UNLIKELY
(
std
::
char_traits
<
char_type
>::
to_char_type
(
get
())
!=
literal_text
[
i
]))
if
(
JSON_HEDLEY_UNLIKELY
(
std
::
char_traits
<
char_type
>::
to_char_type
(
get
())
!=
literal_text
[
i
]))
...
@@ -1523,7 +1523,7 @@ scan_number_done:
...
@@ -1523,7 +1523,7 @@ scan_number_done:
number_float_t
value_float
=
0
;
number_float_t
value_float
=
0
;
/// the decimal point
/// the decimal point
const
char_type
decimal_point_char
=
'.'
;
const
char_
int_
type
decimal_point_char
=
'.'
;
};
};
}
// namespace detail
}
// namespace detail
}
// namespace nlohmann
}
// namespace nlohmann
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