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
b69713c3
Unverified
Commit
b69713c3
authored
Jan 02, 2022
by
Niels Lohmann
Committed by
GitHub
Jan 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation error with NVCC (#3234)
parent
926df56d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
include/nlohmann/ordered_map.hpp
include/nlohmann/ordered_map.hpp
+4
-4
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+4
-4
test/cuda_example/json_cuda.cu
test/cuda_example/json_cuda.cu
+4
-0
No files found.
include/nlohmann/ordered_map.hpp
View file @
b69713c3
...
...
@@ -23,10 +23,10 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
using
key_type
=
Key
;
using
mapped_type
=
T
;
using
Container
=
std
::
vector
<
std
::
pair
<
const
Key
,
T
>
,
Allocator
>
;
using
typename
Container
::
iterator
;
using
typename
Container
::
const_iterator
;
using
typename
Container
::
size_type
;
using
typename
Container
::
value_type
;
using
iterator
=
typename
Container
::
iterator
;
using
const_iterator
=
typename
Container
::
const_iterator
;
using
size_type
=
typename
Container
::
size_type
;
using
value_type
=
typename
Container
::
value_type
;
// Explicit constructors instead of `using Container::Container`
// otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
...
...
single_include/nlohmann/json.hpp
View file @
b69713c3
...
...
@@ -17041,10 +17041,10 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
using key_type = Key;
using mapped_type = T;
using Container = std::vector<std::pair<const Key, T>, Allocator>;
using typename Container::iterator;
using typename Container::const_iterator;
using typename Container::size_type;
using typename Container::value_type;
using
iterator =
typename Container::iterator;
using
const_iterator =
typename Container::const_iterator;
using
size_type =
typename Container::size_type;
using
value_type =
typename Container::value_type;
// Explicit constructors instead of `using Container::Container`
// otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
...
...
test/cuda_example/json_cuda.cu
View file @
b69713c3
...
...
@@ -4,4 +4,8 @@ int main()
{
nlohmann
::
ordered_json
json
=
{
"Test"
};
json
.
dump
();
// regression for #3013 (ordered_json::reset() compile error with nvcc)
nlohmann
::
ordered_json
metadata
;
metadata
.
erase
(
"key"
);
}
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