mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-11-23 22:19:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation error with NVCC (#3234)

Browse Source
This commit is contained in:
Niels Lohmann 2022-01-02 09:03:56 +01:00 committed by GitHub
parent 926df56ddb
commit b69713c394
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/nlohmann/ordered_map.hpp
View File

@ -23,10 +23,10 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
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 Container = std::vector<std::pair<const Key, T>, Allocator>;
using typename Container::iterator; using iterator = typename Container::iterator;
using typename Container::const_iterator; using const_iterator = typename Container::const_iterator;
using typename Container::size_type; using size_type = typename Container::size_type;
using typename Container::value_type; using value_type = typename Container::value_type;
// Explicit constructors instead of `using Container::Container` // Explicit constructors instead of `using Container::Container`
// otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4) // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)

8
single_include/nlohmann/json.hpp
View File

@ -17041,10 +17041,10 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
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 Container = std::vector<std::pair<const Key, T>, Allocator>;
using typename Container::iterator; using iterator = typename Container::iterator;
using typename Container::const_iterator; using const_iterator = typename Container::const_iterator;
using typename Container::size_type; using size_type = typename Container::size_type;
using typename Container::value_type; using value_type = typename Container::value_type;
// Explicit constructors instead of `using Container::Container` // Explicit constructors instead of `using Container::Container`
// otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4) // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)

4
test/cuda_example/json_cuda.cu
View File

@ -4,4 +4,8 @@ int main()
{ {
nlohmann::ordered_json json = {"Test"}; nlohmann::ordered_json json = {"Test"};
json.dump(); json.dump();
// regression for #3013 (ordered_json::reset() compile error with nvcc)
nlohmann::ordered_json metadata;
metadata.erase("key");
} }