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
85092226
Unverified
Commit
85092226
authored
Jun 23, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🚨
removed compiler warnings
parent
0460b909
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
28 deletions
+26
-28
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/binary_reader.hpp
+11
-8
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/input/lexer.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+12
-9
test/src/unit-conversions.cpp
test/src/unit-conversions.cpp
+0
-8
test/src/unit-testsuites.cpp
test/src/unit-testsuites.cpp
+2
-2
No files found.
include/nlohmann/detail/input/binary_reader.hpp
View file @
85092226
...
...
@@ -35,6 +35,7 @@ class binary_reader
{
using
number_integer_t
=
typename
BasicJsonType
::
number_integer_t
;
using
number_unsigned_t
=
typename
BasicJsonType
::
number_unsigned_t
;
using
number_float_t
=
typename
BasicJsonType
::
number_float_t
;
using
string_t
=
typename
BasicJsonType
::
string_t
;
using
json_sax_t
=
json_sax
<
BasicJsonType
>
;
...
...
@@ -423,19 +424,21 @@ class binary_reader
val
=
(
mant
==
0
)
?
std
::
numeric_limits
<
double
>::
infinity
()
:
std
::
numeric_limits
<
double
>::
quiet_NaN
();
}
return
sax
->
number_float
((
half
&
0x8000
)
!=
0
?
-
val
:
val
,
""
);
return
sax
->
number_float
((
half
&
0x8000
)
!=
0
?
static_cast
<
number_float_t
>
(
-
val
)
:
static_cast
<
number_float_t
>
(
val
),
""
);
}
case
0xFA
:
// Single-Precision Float (four-byte IEEE 754)
{
float
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
double
>
(
number
),
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
),
""
);
}
case
0xFB
:
// Double-Precision Float (eight-byte IEEE 754)
{
double
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
number
,
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
)
,
""
);
}
default:
// anything else (0xFF is handled inside the other types)
...
...
@@ -676,13 +679,13 @@ class binary_reader
case
0xCA
:
// float 32
{
float
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
double
>
(
number
),
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
),
""
);
}
case
0xCB
:
// float 64
{
double
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
number
,
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
)
,
""
);
}
case
0xCC
:
// uint 8
...
...
@@ -1464,13 +1467,13 @@ class binary_reader
case
'd'
:
{
float
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
double
>
(
number
),
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
),
""
);
}
case
'D'
:
{
double
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
number
,
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
)
,
""
);
}
case
'C'
:
// char
...
...
@@ -1664,7 +1667,7 @@ class binary_reader
std
::
string
get_token_string
()
const
{
char
cr
[
3
];
snprintf
(
cr
,
3
,
"%.2
X"
,
current
);
snprintf
(
cr
,
3
,
"%.2
hhX"
,
static_cast
<
unsigned
char
>
(
current
)
);
return
std
::
string
{
cr
};
}
...
...
include/nlohmann/detail/input/lexer.hpp
View file @
85092226
...
...
@@ -1173,7 +1173,7 @@ scan_number_done:
{
// escape control characters
char
cs
[
9
];
snprintf
(
cs
,
9
,
"<U+%.4X>"
,
c
);
snprintf
(
cs
,
9
,
"<U+%.4
hh
X>"
,
c
);
result
+=
cs
;
}
else
...
...
single_include/nlohmann/json.hpp
View file @
85092226
...
...
@@ -3165,7 +3165,7 @@ scan_number_done:
{
// escape control characters
char
cs
[
9
];
snprintf
(
cs
,
9
,
"<U+%.4X>"
,
c
);
snprintf
(
cs
,
9
,
"<U+%.4
hh
X>"
,
c
);
result
+=
cs
;
}
else
...
...
@@ -5670,6 +5670,7 @@ class binary_reader
{
using
number_integer_t
=
typename
BasicJsonType
::
number_integer_t
;
using
number_unsigned_t
=
typename
BasicJsonType
::
number_unsigned_t
;
using
number_float_t
=
typename
BasicJsonType
::
number_float_t
;
using
string_t
=
typename
BasicJsonType
::
string_t
;
using
json_sax_t
=
json_sax
<
BasicJsonType
>
;
...
...
@@ -6058,19 +6059,21 @@ class binary_reader
val
=
(
mant
==
0
)
?
std
::
numeric_limits
<
double
>::
infinity
()
:
std
::
numeric_limits
<
double
>::
quiet_NaN
();
}
return
sax
->
number_float
((
half
&
0x8000
)
!=
0
?
-
val
:
val
,
""
);
return
sax
->
number_float
((
half
&
0x8000
)
!=
0
?
static_cast
<
number_float_t
>
(
-
val
)
:
static_cast
<
number_float_t
>
(
val
),
""
);
}
case
0xFA
:
// Single-Precision Float (four-byte IEEE 754)
{
float
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
double
>
(
number
),
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
),
""
);
}
case
0xFB
:
// Double-Precision Float (eight-byte IEEE 754)
{
double
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
number
,
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
)
,
""
);
}
default:
// anything else (0xFF is handled inside the other types)
...
...
@@ -6311,13 +6314,13 @@ class binary_reader
case
0xCA
:
// float 32
{
float
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
double
>
(
number
),
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
),
""
);
}
case
0xCB
:
// float 64
{
double
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
number
,
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
)
,
""
);
}
case
0xCC
:
// uint 8
...
...
@@ -7099,13 +7102,13 @@ class binary_reader
case
'd'
:
{
float
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
double
>
(
number
),
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
),
""
);
}
case
'D'
:
{
double
number
;
return
get_number
(
number
)
and
sax
->
number_float
(
number
,
""
);
return
get_number
(
number
)
and
sax
->
number_float
(
static_cast
<
number_float_t
>
(
number
)
,
""
);
}
case
'C'
:
// char
...
...
@@ -7299,7 +7302,7 @@ class binary_reader
std
::
string
get_token_string
()
const
{
char
cr
[
3
];
snprintf
(
cr
,
3
,
"%.2
X"
,
current
);
snprintf
(
cr
,
3
,
"%.2
hhX"
,
static_cast
<
unsigned
char
>
(
current
)
);
return
std
::
string
{
cr
};
}
...
...
test/src/unit-conversions.cpp
View file @
85092226
...
...
@@ -40,14 +40,6 @@ using nlohmann::json;
#include <unordered_set>
#include <valarray>
namespace
{
template
<
typename
MapType
>
void
map_type_conversion_checks
()
{
}
}
TEST_CASE
(
"value conversion"
)
{
SECTION
(
"get an object (explicit)"
)
...
...
test/src/unit-testsuites.cpp
View file @
85092226
...
...
@@ -1191,7 +1191,7 @@ TEST_CASE("nst's JSONTestSuite (2)")
{
CAPTURE
(
filename
);
std
::
ifstream
f
(
filename
);
CHECK_THROWS_AS
(
json
::
parse
(
f
),
json
::
parse_error
);
CHECK_THROWS_AS
(
json
::
parse
(
f
),
json
::
parse_error
&
);
std
::
ifstream
f2
(
filename
);
CHECK
(
not
json
::
accept
(
f2
));
}
...
...
@@ -1306,7 +1306,7 @@ TEST_CASE("nst's JSONTestSuite (2)")
{
CAPTURE
(
filename
);
std
::
ifstream
f
(
filename
);
CHECK_THROWS_AS
(
json
::
parse
(
f
),
json
::
exception
);
// could be parse_error or out_of_range
CHECK_THROWS_AS
(
json
::
parse
(
f
),
json
::
exception
&
);
// could be parse_error or out_of_range
std
::
ifstream
f2
(
filename
);
CHECK
(
not
json
::
accept
(
f2
));
}
...
...
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