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
25f5d75e
Commit
25f5d75e
authored
Jul 03, 2020
by
Agustín F. Pozuelo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation for xcode 9.x
parent
93770467
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
include/nlohmann/json_fwd.hpp
include/nlohmann/json_fwd.hpp
+1
-1
include/nlohmann/ordered_map.hpp
include/nlohmann/ordered_map.hpp
+3
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+3
-1
No files found.
include/nlohmann/json_fwd.hpp
View file @
25f5d75e
...
...
@@ -61,7 +61,7 @@ uses the standard template types.
*/
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
;
/*!
...
...
include/nlohmann/ordered_map.hpp
View file @
25f5d75e
...
...
@@ -22,11 +22,13 @@ struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
using
typename
Container
::
value_type
;
// Explicit constructors instead of `using Container::Container`
// otherwise older compilers
like GCC 5.5 choke on it
// otherwise older compilers
choke on it (GCC <= 5.5, xcode <= 9.4)
ordered_map
(
const
Allocator
&
alloc
=
Allocator
())
:
Container
{
alloc
}
{}
template
<
class
It
>
ordered_map
(
It
first
,
It
last
,
const
Allocator
&
alloc
=
Allocator
())
:
Container
{
first
,
last
,
alloc
}
{}
ordered_map
(
std
::
initializer_list
<
T
>
init
,
const
Allocator
&
alloc
=
Allocator
()
)
:
Container
{
init
,
alloc
}
{}
std
::
pair
<
iterator
,
bool
>
emplace
(
key_type
&&
key
,
T
&&
t
)
{
...
...
single_include/nlohmann/json.hpp
View file @
25f5d75e
...
...
@@ -15891,11 +15891,13 @@ struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
using
typename
Container
::
value_type
;
// Explicit constructors instead of `using Container::Container`
// otherwise older compilers
like GCC 5.5 choke on it
// otherwise older compilers
choke on it (GCC <= 5.5, xcode <= 9.4)
ordered_map
(
const
Allocator
&
alloc
=
Allocator
())
:
Container
{
alloc
}
{}
template
<
class
It
>
ordered_map
(
It
first
,
It
last
,
const
Allocator
&
alloc
=
Allocator
())
:
Container
{
first
,
last
,
alloc
}
{}
ordered_map
(
std
::
initializer_list
<
T
>
init
,
const
Allocator
&
alloc
=
Allocator
()
)
:
Container
{
init
,
alloc
}
{}
std
::
pair
<
iterator
,
bool
>
emplace
(
key_type
&&
key
,
T
&&
t
)
{
...
...
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