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
93770467
Commit
93770467
authored
Jul 03, 2020
by
Agustín F. Pozuelo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Precisely 4 template arguments for the sake of clang 3.6 (?)
parent
0fc261f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
include/nlohmann/ordered_map.hpp
include/nlohmann/ordered_map.hpp
+3
-3
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+6
-6
No files found.
include/nlohmann/ordered_map.hpp
View file @
93770467
...
@@ -11,12 +11,12 @@ namespace nlohmann
...
@@ -11,12 +11,12 @@ namespace nlohmann
/// ordered_map: a minimal map-like container that preserves insertion order
/// ordered_map: a minimal map-like container that preserves insertion order
/// for use within nlohmann::basic_json<ordered_map>
/// for use within nlohmann::basic_json<ordered_map>
template
<
class
Key
,
class
T
,
class
IgnoredLess
=
std
::
less
<
Key
>,
template
<
class
Key
,
class
T
,
class
IgnoredLess
=
std
::
less
<
Key
>,
class
Allocator
=
std
::
allocator
<
std
::
pair
<
const
Key
,
T
>>
,
class
Allocator
=
std
::
allocator
<
std
::
pair
<
const
Key
,
T
>>>
class
Container
=
std
::
vector
<
std
::
pair
<
const
Key
,
T
>
,
Allocator
>>
struct
ordered_map
:
std
::
vector
<
std
::
pair
<
const
Key
,
T
>
,
Allocator
>
struct
ordered_map
:
Container
{
{
using
key_type
=
Key
;
using
key_type
=
Key
;
using
mapped_type
=
T
;
using
mapped_type
=
T
;
using
Container
=
std
::
vector
<
std
::
pair
<
const
Key
,
T
>
,
Allocator
>
;
using
typename
Container
::
iterator
;
using
typename
Container
::
iterator
;
using
typename
Container
::
size_type
;
using
typename
Container
::
size_type
;
using
typename
Container
::
value_type
;
using
typename
Container
::
value_type
;
...
...
single_include/nlohmann/json.hpp
View file @
93770467
...
@@ -2773,7 +2773,7 @@ uses the standard template types.
...
@@ -2773,7 +2773,7 @@ uses the standard template types.
*/
*/
using
json
=
basic_json
<>
;
using
json
=
basic_json
<>
;
template
<
class
Key
,
class
T
,
class
IgnoredLess
,
class
Allocator
,
class
Container
>
template
<
class
Key
,
class
T
,
class
IgnoredLess
,
class
Allocator
>
struct
ordered_map
;
struct
ordered_map
;
/*!
/*!
...
@@ -15880,12 +15880,12 @@ namespace nlohmann
...
@@ -15880,12 +15880,12 @@ namespace nlohmann
/// ordered_map: a minimal map-like container that preserves insertion order
/// ordered_map: a minimal map-like container that preserves insertion order
/// for use within nlohmann::basic_json<ordered_map>
/// for use within nlohmann::basic_json<ordered_map>
template
<
class
Key
,
class
T
,
class
IgnoredLess
=
std
::
less
<
Key
>,
template
<
class
Key
,
class
T
,
class
IgnoredLess
=
std
::
less
<
Key
>,
class
Allocator
=
std
::
allocator
<
std
::
pair
<
const
Key
,
T
>>
,
class
Allocator
=
std
::
allocator
<
std
::
pair
<
const
Key
,
T
>>>
class
Container
=
std
::
vector
<
std
::
pair
<
const
Key
,
T
>
,
Allocator
>>
struct
ordered_map
:
std
::
vector
<
std
::
pair
<
const
Key
,
T
>
,
Allocator
>
struct
ordered_map
:
Container
{
{
using
key_type
=
Key
;
using
key_type
=
Key
;
using
mapped_type
=
T
;
using
mapped_type
=
T
;
using
Container
=
std
::
vector
<
std
::
pair
<
const
Key
,
T
>
,
Allocator
>
;
using
typename
Container
::
iterator
;
using
typename
Container
::
iterator
;
using
typename
Container
::
size_type
;
using
typename
Container
::
size_type
;
using
typename
Container
::
value_type
;
using
typename
Container
::
value_type
;
...
@@ -16063,7 +16063,7 @@ class basic_json
...
@@ -16063,7 +16063,7 @@ class basic_json
InputAdapterType
adapter
,
InputAdapterType
adapter
,
detail
::
parser_callback_t
<
basic_json
>
cb
=
nullptr
,
detail
::
parser_callback_t
<
basic_json
>
cb
=
nullptr
,
bool
allow_exceptions
=
true
bool
allow_exceptions
=
true
)
)
{
{
return
::
nlohmann
::
detail
::
parser
<
basic_json
,
InputAdapterType
>
(
std
::
move
(
adapter
),
std
::
move
(
cb
),
allow_exceptions
);
return
::
nlohmann
::
detail
::
parser
<
basic_json
,
InputAdapterType
>
(
std
::
move
(
adapter
),
std
::
move
(
cb
),
allow_exceptions
);
}
}
...
@@ -24534,7 +24534,7 @@ template<>
...
@@ -24534,7 +24534,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