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
6e49d9f5
Unverified
Commit
6e49d9f5
authored
Oct 07, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🚑
fixed compilation error
parent
3abb7881
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
22 deletions
+18
-22
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/input/lexer.hpp
+2
-2
include/nlohmann/detail/output/serializer.hpp
include/nlohmann/detail/output/serializer.hpp
+2
-2
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+14
-18
No files found.
include/nlohmann/detail/input/lexer.hpp
View file @
6e49d9f5
...
@@ -104,9 +104,9 @@ class lexer
...
@@ -104,9 +104,9 @@ class lexer
// delete because of pointer members
// delete because of pointer members
lexer
(
const
lexer
&
)
=
delete
;
lexer
(
const
lexer
&
)
=
delete
;
lexer
(
lexer
&&
)
noexcept
=
default
;
lexer
(
lexer
&&
)
=
delete
;
lexer
&
operator
=
(
lexer
&
)
=
delete
;
lexer
&
operator
=
(
lexer
&
)
=
delete
;
lexer
&
operator
=
(
lexer
&&
)
noexcept
=
default
;
lexer
&
operator
=
(
lexer
&&
)
=
delete
;
~
lexer
()
=
default
;
~
lexer
()
=
default
;
private:
private:
...
...
include/nlohmann/detail/output/serializer.hpp
View file @
6e49d9f5
...
@@ -53,8 +53,8 @@ class serializer
...
@@ -53,8 +53,8 @@ class serializer
// delete because of pointer members
// delete because of pointer members
serializer
(
const
serializer
&
)
=
delete
;
serializer
(
const
serializer
&
)
=
delete
;
serializer
&
operator
=
(
const
serializer
&
)
=
delete
;
serializer
&
operator
=
(
const
serializer
&
)
=
delete
;
serializer
(
serializer
&&
)
noexcept
=
default
;
serializer
(
serializer
&&
)
=
delete
;
serializer
&
operator
=
(
serializer
&&
)
noexcept
=
default
;
serializer
&
operator
=
(
serializer
&&
)
=
delete
;
~
serializer
()
=
default
;
~
serializer
()
=
default
;
/*!
/*!
...
...
single_include/nlohmann/json.hpp
View file @
6e49d9f5
...
@@ -2373,9 +2373,9 @@ class lexer
...
@@ -2373,9 +2373,9 @@ class lexer
// delete because of pointer members
// delete because of pointer members
lexer
(
const
lexer
&
)
=
delete
;
lexer
(
const
lexer
&
)
=
delete
;
lexer
(
lexer
&&
)
noexcept
=
default
;
lexer
(
lexer
&&
)
=
delete
;
lexer
&
operator
=
(
lexer
&
)
=
delete
;
lexer
&
operator
=
(
lexer
&
)
=
delete
;
lexer
&
operator
=
(
lexer
&&
)
noexcept
=
default
;
lexer
&
operator
=
(
lexer
&&
)
=
delete
;
~
lexer
()
=
default
;
~
lexer
()
=
default
;
private:
private:
...
@@ -8510,22 +8510,20 @@ class binary_writer
...
@@ -8510,22 +8510,20 @@ class binary_writer
{
{
return
'i'
;
return
'i'
;
}
}
else
if
((
std
::
numeric_limits
<
uint8_t
>::
min
)()
<=
j
.
m_value
.
number_integer
and
j
.
m_value
.
number_integer
<=
(
std
::
numeric_limits
<
uint8_t
>::
max
)())
if
((
std
::
numeric_limits
<
uint8_t
>::
min
)()
<=
j
.
m_value
.
number_integer
and
j
.
m_value
.
number_integer
<=
(
std
::
numeric_limits
<
uint8_t
>::
max
)())
{
{
return
'U'
;
return
'U'
;
}
}
else
if
((
std
::
numeric_limits
<
int16_t
>::
min
)()
<=
j
.
m_value
.
number_integer
and
j
.
m_value
.
number_integer
<=
(
std
::
numeric_limits
<
int16_t
>::
max
)())
if
((
std
::
numeric_limits
<
int16_t
>::
min
)()
<=
j
.
m_value
.
number_integer
and
j
.
m_value
.
number_integer
<=
(
std
::
numeric_limits
<
int16_t
>::
max
)())
{
{
return
'I'
;
return
'I'
;
}
}
else
if
((
std
::
numeric_limits
<
int32_t
>::
min
)()
<=
j
.
m_value
.
number_integer
and
j
.
m_value
.
number_integer
<=
(
std
::
numeric_limits
<
int32_t
>::
max
)())
if
((
std
::
numeric_limits
<
int32_t
>::
min
)()
<=
j
.
m_value
.
number_integer
and
j
.
m_value
.
number_integer
<=
(
std
::
numeric_limits
<
int32_t
>::
max
)())
{
{
return
'l'
;
return
'l'
;
}
}
else
// no check and assume int64_t (see note above)
// no check and assume int64_t (see note above)
{
return
'L'
;
return
'L'
;
}
}
}
case
value_t
:
:
number_unsigned
:
case
value_t
:
:
number_unsigned
:
...
@@ -8534,22 +8532,20 @@ class binary_writer
...
@@ -8534,22 +8532,20 @@ class binary_writer
{
{
return
'i'
;
return
'i'
;
}
}
else
if
(
j
.
m_value
.
number_unsigned
<=
(
std
::
numeric_limits
<
uint8_t
>::
max
)())
if
(
j
.
m_value
.
number_unsigned
<=
(
std
::
numeric_limits
<
uint8_t
>::
max
)())
{
{
return
'U'
;
return
'U'
;
}
}
else
if
(
j
.
m_value
.
number_unsigned
<=
(
std
::
numeric_limits
<
int16_t
>::
max
)())
if
(
j
.
m_value
.
number_unsigned
<=
(
std
::
numeric_limits
<
int16_t
>::
max
)())
{
{
return
'I'
;
return
'I'
;
}
}
else
if
(
j
.
m_value
.
number_unsigned
<=
(
std
::
numeric_limits
<
int32_t
>::
max
)())
if
(
j
.
m_value
.
number_unsigned
<=
(
std
::
numeric_limits
<
int32_t
>::
max
)())
{
{
return
'l'
;
return
'l'
;
}
}
else
// no check and assume int64_t (see note above)
// no check and assume int64_t (see note above)
{
return
'L'
;
return
'L'
;
}
}
}
case
value_t
:
:
number_float
:
case
value_t
:
:
number_float
:
...
@@ -9765,8 +9761,8 @@ class serializer
...
@@ -9765,8 +9761,8 @@ class serializer
// delete because of pointer members
// delete because of pointer members
serializer
(
const
serializer
&
)
=
delete
;
serializer
(
const
serializer
&
)
=
delete
;
serializer
&
operator
=
(
const
serializer
&
)
=
delete
;
serializer
&
operator
=
(
const
serializer
&
)
=
delete
;
serializer
(
serializer
&&
)
noexcept
=
default
;
serializer
(
serializer
&&
)
=
delete
;
serializer
&
operator
=
(
serializer
&&
)
noexcept
=
default
;
serializer
&
operator
=
(
serializer
&&
)
=
delete
;
~
serializer
()
=
default
;
~
serializer
()
=
default
;
/*!
/*!
...
...
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