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
b49f7693
Unverified
Commit
b49f7693
authored
6 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaced static_cast to CharType by conversion function #1286
parent
9294e25c
develop
bon8
coverity_scan
feature/optional
gcc_warning_flags
icpc
issue2228
issue2615
issue2932
issue3232_use_catch
master
release/3.10.2
release/3.10.3
release/3.10.4
release/3.10.5
string_view
string_view2
update_doctest
3.6.1
v3.10.5
v3.10.4
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.9.1
v3.9.0
v3.8.0
v3.7.3
v3.7.2
v3.7.1
v3.7.0
v3.6.1
v3.6.0
v3.5.0
v3.4.0
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
212 additions
and
162 deletions
+212
-162
include/nlohmann/detail/meta/type_traits.hpp
include/nlohmann/detail/meta/type_traits.hpp
+6
-6
include/nlohmann/detail/output/binary_writer.hpp
include/nlohmann/detail/output/binary_writer.hpp
+100
-75
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+106
-81
No files found.
include/nlohmann/detail/meta/type_traits.hpp
View file @
b49f7693
...
...
@@ -193,13 +193,13 @@ struct is_constructible_object_type_impl <
static
constexpr
bool
value
=
std
::
is_constructible
<
typename
ConstructibleObjectType
::
key_type
,
typename
object_t
::
key_type
>::
value
and
std
::
is_same
<
typename
object_t
::
mapped_type
,
typename
ConstructibleObjectType
::
mapped_type
>::
value
or
(
has_from_json
<
BasicJsonType
,
(
std
::
is_same
<
typename
object_t
::
mapped_type
,
typename
ConstructibleObjectType
::
mapped_type
>::
value
or
has_non_default_from_json
<
BasicJsonType
,
typename
ConstructibleObjectType
::
mapped_type
>::
value
);
(
has_from_json
<
BasicJsonType
,
typename
ConstructibleObjectType
::
mapped_type
>::
value
or
has_non_default_from_json
<
BasicJsonType
,
typename
ConstructibleObjectType
::
mapped_type
>::
value
));
};
template
<
typename
BasicJsonType
,
typename
ConstructibleObjectType
>
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/detail/output/binary_writer.hpp
View file @
b49f7693
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
b49f7693
This diff is collapsed.
Click to expand it.
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