Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
db5c9ec9
Commit
db5c9ec9
authored
May 11, 2016
by
Niels
Browse files
Options
Browse Files
Download
Plain Diff
fixed issue #239 (-Wconversion warnings)
parents
9ecf83f6
91aa4c9d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
json.hpp
src/json.hpp
+6
-4
json.hpp.re2c
src/json.hpp.re2c
+6
-4
No files found.
src/json.hpp
View file @
db5c9ec9
...
@@ -757,7 +757,7 @@ class basic_json
...
@@ -757,7 +757,7 @@ class basic_json
/// assignment
/// assignment
type_data_t
&
operator
=
(
value_t
rhs
)
type_data_t
&
operator
=
(
value_t
rhs
)
{
{
bits
.
type
=
static_cast
<
uint16_t
>
(
rhs
)
;
bits
.
type
=
static_cast
<
uint16_t
>
(
rhs
)
&
15
;
// avoid overflow
return
*
this
;
return
*
this
;
}
}
...
@@ -765,7 +765,7 @@ class basic_json
...
@@ -765,7 +765,7 @@ class basic_json
type_data_t
(
value_t
t
)
noexcept
type_data_t
(
value_t
t
)
noexcept
{
{
*
reinterpret_cast
<
uint16_t
*>
(
this
)
=
0
;
*
reinterpret_cast
<
uint16_t
*>
(
this
)
=
0
;
bits
.
type
=
static_cast
<
uint16_t
>
(
t
)
;
bits
.
type
=
static_cast
<
uint16_t
>
(
t
)
&
15
;
// avoid overflow
}
}
/// default constructor
/// default constructor
...
@@ -6011,9 +6011,11 @@ class basic_json
...
@@ -6011,9 +6011,11 @@ class basic_json
{
{
// convert a number 0..15 to its hex representation
// convert a number 0..15 to its hex representation
// (0..f)
// (0..f)
auto
hexify
=
[](
const
char
v
)
->
char
const
auto
hexify
=
[](
const
int
v
)
->
char
{
{
return
(
v
<
10
)
?
(
'0'
+
v
)
:
(
'a'
+
v
-
10
);
return
(
v
<
10
)
?
(
'0'
+
static_cast
<
char
>
(
v
))
:
(
'a'
+
static_cast
<
char
>
((
v
-
10
)
&
0x1f
));
};
};
// print character c as \uxxxx
// print character c as \uxxxx
...
...
src/json.hpp.re2c
View file @
db5c9ec9
...
@@ -757,7 +757,7 @@ class basic_json
...
@@ -757,7 +757,7 @@ class basic_json
/// assignment
/// assignment
type_data_t& operator=(value_t rhs)
type_data_t& operator=(value_t rhs)
{
{
bits.type = static_cast<uint16_t>(rhs)
;
bits.type = static_cast<uint16_t>(rhs)
& 15; // avoid overflow
return *this;
return *this;
}
}
...
@@ -765,7 +765,7 @@ class basic_json
...
@@ -765,7 +765,7 @@ class basic_json
type_data_t(value_t t) noexcept
type_data_t(value_t t) noexcept
{
{
*reinterpret_cast<uint16_t*>(this) = 0;
*reinterpret_cast<uint16_t*>(this) = 0;
bits.type = static_cast<uint16_t>(t)
;
bits.type = static_cast<uint16_t>(t)
& 15; // avoid overflow
}
}
/// default constructor
/// default constructor
...
@@ -6011,9 +6011,11 @@ class basic_json
...
@@ -6011,9 +6011,11 @@ class basic_json
{
{
// convert a number 0..15 to its hex representation
// convert a number 0..15 to its hex representation
// (0..f)
// (0..f)
auto hexify = [](const char
v) -> char
const auto hexify = [](const int
v) -> char
{
{
return (v < 10) ? ('0' + v) : ('a' + v - 10);
return (v < 10)
? ('0' + static_cast<char>(v))
: ('a' + static_cast<char>((v - 10) & 0x1f));
};
};
// print character c as \uxxxx
// print character c as \uxxxx
...
...
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