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
803c16e5
Commit
803c16e5
authored
Jul 03, 2020
by
Agustín F. Pozuelo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean-up unintended changes to whitespace
parent
25f5d75e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
6 deletions
+2
-6
.gitignore
.gitignore
+0
-4
doc/mkdocs/docs/features/types.md
doc/mkdocs/docs/features/types.md
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+1
-1
No files found.
.gitignore
View file @
803c16e5
...
@@ -25,11 +25,7 @@ benchmarks/files/numbers/*.json
...
@@ -25,11 +25,7 @@ benchmarks/files/numbers/*.json
cmake-build-debug
cmake-build-debug
test/test-*
test/test-*
test/test_data.hpp
Temporary
/.vs
/.vs
.vscode
doc/mkdocs/venv/
doc/mkdocs/venv/
doc/mkdocs/docs/images
doc/mkdocs/docs/images
...
...
doc/mkdocs/docs/features/types.md
View file @
803c16e5
...
@@ -89,7 +89,7 @@ From the template arguments, the following types are derived:
...
@@ -89,7 +89,7 @@ From the template arguments, the following types are derived:
```
cpp
```
cpp
using
object_comparator_t
=
std
::
less
<>
;
using
object_comparator_t
=
std
::
less
<>
;
using
object_t
=
ObjectType
<
StringType
,
basic_json
,
object_comparator_t
,
using
object_t
=
ObjectType
<
StringType
,
basic_json
,
object_comparator_t
,
AllocatorType
<
std
::
pair
<
const
StringType
,
basic_json
>>>
;
AllocatorType
<
std
::
pair
<
const
StringType
,
basic_json
>>>
;
using
array_t
=
ArrayType
<
basic_json
,
AllocatorType
<
basic_json
>>
;
using
array_t
=
ArrayType
<
basic_json
,
AllocatorType
<
basic_json
>>
;
...
...
single_include/nlohmann/json.hpp
View file @
803c16e5
...
@@ -24536,7 +24536,7 @@ template<>
...
@@ -24536,7 +24536,7 @@ template<>
inline
void
swap
<
nlohmann
::
json
>
(
nlohmann
::
json
&
j1
,
nlohmann
::
json
&
j2
)
noexcept
(
inline
void
swap
<
nlohmann
::
json
>
(
nlohmann
::
json
&
j1
,
nlohmann
::
json
&
j2
)
noexcept
(
is_nothrow_move_constructible
<
nlohmann
::
json
>::
value
and
is_nothrow_move_constructible
<
nlohmann
::
json
>::
value
and
is_nothrow_move_assignable
<
nlohmann
::
json
>::
value
is_nothrow_move_assignable
<
nlohmann
::
json
>::
value
)
)
{
{
j1
.
swap
(
j2
);
j1
.
swap
(
j2
);
}
}
...
...
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