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
7acd90b6
Commit
7acd90b6
authored
Jun 04, 2018
by
Guillaume Racicot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed check for compatible string type
parent
4778c02a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
include/nlohmann/detail/conversions/from_json.hpp
include/nlohmann/detail/conversions/from_json.hpp
+1
-3
include/nlohmann/detail/meta.hpp
include/nlohmann/detail/meta.hpp
+2
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+3
-4
No files found.
include/nlohmann/detail/conversions/from_json.hpp
View file @
7acd90b6
...
...
@@ -75,9 +75,7 @@ template <
enable_if_t
<
is_compatible_string_type
<
BasicJsonType
,
CompatibleStringType
>
::
value
and
not
std
::
is_same
<
typename
BasicJsonType
::
string_t
,
CompatibleStringType
>::
value
and
std
::
is_constructible
<
BasicJsonType
,
typename
CompatibleStringType
::
value_type
>::
value
,
CompatibleStringType
>::
value
,
int
>
=
0
>
void
from_json
(
const
BasicJsonType
&
j
,
CompatibleStringType
&
s
)
{
...
...
include/nlohmann/detail/meta.hpp
View file @
7acd90b6
...
...
@@ -127,7 +127,8 @@ template<class RealType, class CompatibleStringType>
struct
is_compatible_string_type_impl
<
true
,
RealType
,
CompatibleStringType
>
{
static
constexpr
auto
value
=
std
::
is_same
<
typename
RealType
::
value_type
,
typename
CompatibleStringType
::
value_type
>::
value
;
std
::
is_same
<
typename
RealType
::
value_type
,
typename
CompatibleStringType
::
value_type
>::
value
and
std
::
is_constructible
<
RealType
,
CompatibleStringType
>::
value
;
};
template
<
class
BasicJsonType
,
class
CompatibleObjectType
>
...
...
single_include/nlohmann/json.hpp
View file @
7acd90b6
...
...
@@ -360,7 +360,8 @@ template<class RealType, class CompatibleStringType>
struct
is_compatible_string_type_impl
<
true
,
RealType
,
CompatibleStringType
>
{
static
constexpr
auto
value
=
std
::
is_same
<
typename
RealType
::
value_type
,
typename
CompatibleStringType
::
value_type
>::
value
;
std
::
is_same
<
typename
RealType
::
value_type
,
typename
CompatibleStringType
::
value_type
>::
value
and
std
::
is_constructible
<
RealType
,
CompatibleStringType
>::
value
;
};
template
<
class
BasicJsonType
,
class
CompatibleObjectType
>
...
...
@@ -1001,9 +1002,7 @@ template <
enable_if_t
<
is_compatible_string_type
<
BasicJsonType
,
CompatibleStringType
>
::
value
and
not
std
::
is_same
<
typename
BasicJsonType
::
string_t
,
CompatibleStringType
>::
value
and
std
::
is_constructible
<
BasicJsonType
,
typename
CompatibleStringType
::
value_type
>::
value
,
CompatibleStringType
>::
value
,
int
>
=
0
>
void
from_json
(
const
BasicJsonType
&
j
,
CompatibleStringType
&
s
)
{
...
...
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