Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
56f6d1d6
Unverified
Commit
56f6d1d6
authored
Mar 17, 2019
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
💚
fix CI and #1521
parent
df0f7f2b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
binary_reader.hpp
include/nlohmann/detail/input/binary_reader.hpp
+2
-2
json_sax.hpp
include/nlohmann/detail/input/json_sax.hpp
+2
-2
json_ref.hpp
include/nlohmann/detail/json_ref.hpp
+1
-1
serializer.hpp
include/nlohmann/detail/output/serializer.hpp
+1
-1
json.hpp
single_include/nlohmann/json.hpp
+6
-6
No files found.
include/nlohmann/detail/input/binary_reader.hpp
View file @
56f6d1d6
...
@@ -54,9 +54,9 @@ class binary_reader
...
@@ -54,9 +54,9 @@ class binary_reader
// make class move-only
// make class move-only
binary_reader
(
const
binary_reader
&
)
=
delete
;
binary_reader
(
const
binary_reader
&
)
=
delete
;
binary_reader
(
binary_reader
&&
)
noexcept
=
default
;
binary_reader
(
binary_reader
&&
)
=
default
;
binary_reader
&
operator
=
(
const
binary_reader
&
)
=
delete
;
binary_reader
&
operator
=
(
const
binary_reader
&
)
=
delete
;
binary_reader
&
operator
=
(
binary_reader
&&
)
noexcept
=
default
;
binary_reader
&
operator
=
(
binary_reader
&&
)
=
default
;
~
binary_reader
()
=
default
;
~
binary_reader
()
=
default
;
/*!
/*!
...
...
include/nlohmann/detail/input/json_sax.hpp
View file @
56f6d1d6
...
@@ -161,9 +161,9 @@ class json_sax_dom_parser
...
@@ -161,9 +161,9 @@ class json_sax_dom_parser
// make class move-only
// make class move-only
json_sax_dom_parser
(
const
json_sax_dom_parser
&
)
=
delete
;
json_sax_dom_parser
(
const
json_sax_dom_parser
&
)
=
delete
;
json_sax_dom_parser
(
json_sax_dom_parser
&&
)
noexcept
=
default
;
json_sax_dom_parser
(
json_sax_dom_parser
&&
)
=
default
;
json_sax_dom_parser
&
operator
=
(
const
json_sax_dom_parser
&
)
=
delete
;
json_sax_dom_parser
&
operator
=
(
const
json_sax_dom_parser
&
)
=
delete
;
json_sax_dom_parser
&
operator
=
(
json_sax_dom_parser
&&
)
noexcept
=
default
;
json_sax_dom_parser
&
operator
=
(
json_sax_dom_parser
&&
)
=
default
;
~
json_sax_dom_parser
()
=
default
;
~
json_sax_dom_parser
()
=
default
;
bool
null
()
bool
null
()
...
...
include/nlohmann/detail/json_ref.hpp
View file @
56f6d1d6
...
@@ -35,7 +35,7 @@ class json_ref
...
@@ -35,7 +35,7 @@ class json_ref
is_rvalue
(
true
)
{}
is_rvalue
(
true
)
{}
// class should be movable only
// class should be movable only
json_ref
(
json_ref
&&
)
noexcept
=
default
;
json_ref
(
json_ref
&&
)
=
default
;
json_ref
(
const
json_ref
&
)
=
delete
;
json_ref
(
const
json_ref
&
)
=
delete
;
json_ref
&
operator
=
(
const
json_ref
&
)
=
delete
;
json_ref
&
operator
=
(
const
json_ref
&
)
=
delete
;
json_ref
&
operator
=
(
json_ref
&&
)
=
delete
;
json_ref
&
operator
=
(
json_ref
&&
)
=
delete
;
...
...
include/nlohmann/detail/output/serializer.hpp
View file @
56f6d1d6
...
@@ -626,7 +626,7 @@ class serializer
...
@@ -626,7 +626,7 @@ class serializer
}
}
// use a pointer to fill the buffer
// use a pointer to fill the buffer
auto
buffer_ptr
=
begin
(
number_buffer
);
auto
buffer_ptr
=
number_buffer
.
begin
(
);
const
bool
is_negative
=
std
::
is_same
<
NumberType
,
number_integer_t
>::
value
and
not
(
x
>=
0
);
// see issue #755
const
bool
is_negative
=
std
::
is_same
<
NumberType
,
number_integer_t
>::
value
and
not
(
x
>=
0
);
// see issue #755
number_unsigned_t
abs_value
;
number_unsigned_t
abs_value
;
...
...
single_include/nlohmann/json.hpp
View file @
56f6d1d6
...
@@ -2839,9 +2839,9 @@ class json_sax_dom_parser
...
@@ -2839,9 +2839,9 @@ class json_sax_dom_parser
// make class move-only
// make class move-only
json_sax_dom_parser
(
const
json_sax_dom_parser
&
)
=
delete
;
json_sax_dom_parser
(
const
json_sax_dom_parser
&
)
=
delete
;
json_sax_dom_parser
(
json_sax_dom_parser
&&
)
noexcept
=
default
;
json_sax_dom_parser
(
json_sax_dom_parser
&&
)
=
default
;
json_sax_dom_parser
&
operator
=
(
const
json_sax_dom_parser
&
)
=
delete
;
json_sax_dom_parser
&
operator
=
(
const
json_sax_dom_parser
&
)
=
delete
;
json_sax_dom_parser
&
operator
=
(
json_sax_dom_parser
&&
)
noexcept
=
default
;
json_sax_dom_parser
&
operator
=
(
json_sax_dom_parser
&&
)
=
default
;
~
json_sax_dom_parser
()
=
default
;
~
json_sax_dom_parser
()
=
default
;
bool
null
()
bool
null
()
...
@@ -3579,9 +3579,9 @@ class binary_reader
...
@@ -3579,9 +3579,9 @@ class binary_reader
// make class move-only
// make class move-only
binary_reader
(
const
binary_reader
&
)
=
delete
;
binary_reader
(
const
binary_reader
&
)
=
delete
;
binary_reader
(
binary_reader
&&
)
noexcept
=
default
;
binary_reader
(
binary_reader
&&
)
=
default
;
binary_reader
&
operator
=
(
const
binary_reader
&
)
=
delete
;
binary_reader
&
operator
=
(
const
binary_reader
&
)
=
delete
;
binary_reader
&
operator
=
(
binary_reader
&&
)
noexcept
=
default
;
binary_reader
&
operator
=
(
binary_reader
&&
)
=
default
;
~
binary_reader
()
=
default
;
~
binary_reader
()
=
default
;
/*!
/*!
...
@@ -9258,7 +9258,7 @@ class json_ref
...
@@ -9258,7 +9258,7 @@ class json_ref
is_rvalue
(
true
)
{}
is_rvalue
(
true
)
{}
// class should be movable only
// class should be movable only
json_ref
(
json_ref
&&
)
noexcept
=
default
;
json_ref
(
json_ref
&&
)
=
default
;
json_ref
(
const
json_ref
&
)
=
delete
;
json_ref
(
const
json_ref
&
)
=
delete
;
json_ref
&
operator
=
(
const
json_ref
&
)
=
delete
;
json_ref
&
operator
=
(
const
json_ref
&
)
=
delete
;
json_ref
&
operator
=
(
json_ref
&&
)
=
delete
;
json_ref
&
operator
=
(
json_ref
&&
)
=
delete
;
...
@@ -12490,7 +12490,7 @@ class serializer
...
@@ -12490,7 +12490,7 @@ class serializer
}
}
// use a pointer to fill the buffer
// use a pointer to fill the buffer
auto
buffer_ptr
=
begin
(
number_buffer
);
auto
buffer_ptr
=
number_buffer
.
begin
(
);
const
bool
is_negative
=
std
::
is_same
<
NumberType
,
number_integer_t
>::
value
and
not
(
x
>=
0
);
// see issue #755
const
bool
is_negative
=
std
::
is_same
<
NumberType
,
number_integer_t
>::
value
and
not
(
x
>=
0
);
// see issue #755
number_unsigned_t
abs_value
;
number_unsigned_t
abs_value
;
...
...
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