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
7feb2c20
Unverified
Commit
7feb2c20
authored
Jul 30, 2021
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🚨
fix useless-cast warnings
parent
a5633380
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
5 deletions
+36
-5
cmake/ci.cmake
cmake/ci.cmake
+1
-1
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/binary_reader.hpp
+3
-2
include/nlohmann/detail/meta/type_traits.hpp
include/nlohmann/detail/meta/type_traits.hpp
+14
-0
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+18
-2
No files found.
cmake/ci.cmake
View file @
7feb2c20
...
@@ -356,7 +356,7 @@ set(GCC_CXXFLAGS "-std=c++11 \
...
@@ -356,7 +356,7 @@ set(GCC_CXXFLAGS "-std=c++11 \
-Wunused-result \
-Wunused-result \
-Wunused-value \
-Wunused-value \
-Wunused-variable \
-Wunused-variable \
-W
no-
useless-cast \
-Wuseless-cast \
-Wvarargs \
-Wvarargs \
-Wvariadic-macros \
-Wvariadic-macros \
-Wvector-operation-performance \
-Wvector-operation-performance \
...
...
include/nlohmann/detail/input/binary_reader.hpp
View file @
7feb2c20
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
#include <nlohmann/detail/input/lexer.hpp>
#include <nlohmann/detail/input/lexer.hpp>
#include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/is_sax.hpp>
#include <nlohmann/detail/meta/is_sax.hpp>
#include <nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/value_t.hpp>
#include <nlohmann/detail/value_t.hpp>
namespace
nlohmann
namespace
nlohmann
...
@@ -631,7 +632,7 @@ class binary_reader
...
@@ -631,7 +632,7 @@ class binary_reader
case
0x9B
:
// array (eight-byte uint64_t for n follow)
case
0x9B
:
// array (eight-byte uint64_t for n follow)
{
{
std
::
uint64_t
len
{};
std
::
uint64_t
len
{};
return
get_number
(
input_format_t
::
cbor
,
len
)
&&
get_cbor_array
(
static_cast
<
std
::
size_t
>
(
len
),
tag_handler
);
return
get_number
(
input_format_t
::
cbor
,
len
)
&&
get_cbor_array
(
detail
::
conditional_
static_cast
<
std
::
size_t
>
(
len
),
tag_handler
);
}
}
case
0x9F
:
// array (indefinite length)
case
0x9F
:
// array (indefinite length)
...
@@ -685,7 +686,7 @@ class binary_reader
...
@@ -685,7 +686,7 @@ class binary_reader
case
0xBB
:
// map (eight-byte uint64_t for n follow)
case
0xBB
:
// map (eight-byte uint64_t for n follow)
{
{
std
::
uint64_t
len
{};
std
::
uint64_t
len
{};
return
get_number
(
input_format_t
::
cbor
,
len
)
&&
get_cbor_object
(
static_cast
<
std
::
size_t
>
(
len
),
tag_handler
);
return
get_number
(
input_format_t
::
cbor
,
len
)
&&
get_cbor_object
(
detail
::
conditional_
static_cast
<
std
::
size_t
>
(
len
),
tag_handler
);
}
}
case
0xBF
:
// map (indefinite length)
case
0xBF
:
// map (indefinite length)
...
...
include/nlohmann/detail/meta/type_traits.hpp
View file @
7feb2c20
...
@@ -435,5 +435,19 @@ struct is_constructible_tuple : std::false_type {};
...
@@ -435,5 +435,19 @@ struct is_constructible_tuple : std::false_type {};
template
<
typename
T1
,
typename
...
Args
>
template
<
typename
T1
,
typename
...
Args
>
struct
is_constructible_tuple
<
T1
,
std
::
tuple
<
Args
...
>>
:
conjunction
<
is_constructible
<
T1
,
Args
>
...
>
{};
struct
is_constructible_tuple
<
T1
,
std
::
tuple
<
Args
...
>>
:
conjunction
<
is_constructible
<
T1
,
Args
>
...
>
{};
// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
template
<
typename
T
,
typename
U
,
std
::
enable_if_t
<
!
std
::
is_same
<
T
,
U
>
::
value
,
int
>
=
0
>
T
conditional_static_cast
(
U
value
)
{
return
static_cast
<
T
>
(
value
);
}
template
<
typename
T
,
typename
U
,
std
::
enable_if_t
<
std
::
is_same
<
T
,
U
>
::
value
,
int
>
=
0
>
T
conditional_static_cast
(
U
value
)
{
return
value
;
}
}
// namespace detail
}
// namespace detail
}
// namespace nlohmann
}
// namespace nlohmann
single_include/nlohmann/json.hpp
View file @
7feb2c20
...
@@ -3835,6 +3835,20 @@ struct is_constructible_tuple : std::false_type {};
...
@@ -3835,6 +3835,20 @@ struct is_constructible_tuple : std::false_type {};
template
<
typename
T1
,
typename
...
Args
>
template
<
typename
T1
,
typename
...
Args
>
struct
is_constructible_tuple
<
T1
,
std
::
tuple
<
Args
...
>>
:
conjunction
<
is_constructible
<
T1
,
Args
>
...
>
{};
struct
is_constructible_tuple
<
T1
,
std
::
tuple
<
Args
...
>>
:
conjunction
<
is_constructible
<
T1
,
Args
>
...
>
{};
// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
template
<
typename
T
,
typename
U
,
std
::
enable_if_t
<
!
std
::
is_same
<
T
,
U
>
::
value
,
int
>
=
0
>
T
conditional_static_cast
(
U
value
)
{
return
static_cast
<
T
>
(
value
);
}
template
<
typename
T
,
typename
U
,
std
::
enable_if_t
<
std
::
is_same
<
T
,
U
>
::
value
,
int
>
=
0
>
T
conditional_static_cast
(
U
value
)
{
return
value
;
}
}
// namespace detail
}
// namespace detail
}
// namespace nlohmann
}
// namespace nlohmann
...
@@ -8240,6 +8254,8 @@ struct is_sax_static_asserts
...
@@ -8240,6 +8254,8 @@ struct is_sax_static_asserts
}
// namespace detail
}
// namespace detail
}
// namespace nlohmann
}
// namespace nlohmann
// #include <nlohmann/detail/meta/type_traits.hpp>
// #include <nlohmann/detail/value_t.hpp>
// #include <nlohmann/detail/value_t.hpp>
...
@@ -8853,7 +8869,7 @@ class binary_reader
...
@@ -8853,7 +8869,7 @@ class binary_reader
case
0x9B
:
// array (eight-byte uint64_t for n follow)
case
0x9B
:
// array (eight-byte uint64_t for n follow)
{
{
std
::
uint64_t
len
{};
std
::
uint64_t
len
{};
return
get_number
(
input_format_t
::
cbor
,
len
)
&&
get_cbor_array
(
static_cast
<
std
::
size_t
>
(
len
),
tag_handler
);
return
get_number
(
input_format_t
::
cbor
,
len
)
&&
get_cbor_array
(
detail
::
conditional_
static_cast
<
std
::
size_t
>
(
len
),
tag_handler
);
}
}
case
0x9F
:
// array (indefinite length)
case
0x9F
:
// array (indefinite length)
...
@@ -8907,7 +8923,7 @@ class binary_reader
...
@@ -8907,7 +8923,7 @@ class binary_reader
case
0xBB
:
// map (eight-byte uint64_t for n follow)
case
0xBB
:
// map (eight-byte uint64_t for n follow)
{
{
std
::
uint64_t
len
{};
std
::
uint64_t
len
{};
return
get_number
(
input_format_t
::
cbor
,
len
)
&&
get_cbor_object
(
static_cast
<
std
::
size_t
>
(
len
),
tag_handler
);
return
get_number
(
input_format_t
::
cbor
,
len
)
&&
get_cbor_object
(
detail
::
conditional_
static_cast
<
std
::
size_t
>
(
len
),
tag_handler
);
}
}
case
0xBF
:
// map (indefinite length)
case
0xBF
:
// map (indefinite length)
...
...
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