j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make ordered_map compatible with GCC 5.5

Browse source
This commit is contained in:
Agustín F. Pozuelo 2020-07-03 00:33:31 +01:00
parent 49f26a0250
commit 0fc261f0f2
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/nlohmann/ordered_map.hpp
View file

@ -11,16 +11,22 @@ 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>>,
struct ordered_map : std::vector<typename Allocator::value_type, Allocator> class Container = std::vector<std::pair<const Key, T>, Allocator>>
struct ordered_map : Container
{ {
using Container = std::vector<typename Allocator::value_type, Allocator>;
using key_type = Key; using key_type = Key;
using mapped_type = T; using mapped_type = T;
using typename Container::iterator; using typename Container::iterator;
using typename Container::value_type;
using typename Container::size_type; using typename Container::size_type;
using Container::Container; using typename Container::value_type;
// Explicit constructors instead of `using Container::Container`
// otherwise older compilers like GCC 5.5 choke on it
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} {}
std::pair<iterator, bool> emplace(key_type&& key, T&& t) std::pair<iterator, bool> emplace(key_type&& key, T&& t)
{ {

18
single_include/nlohmann/json.hpp
View file

@ -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> template<class Key, class T, class IgnoredLess, class Allocator, class Container>
struct ordered_map; struct ordered_map;
/*! /*!
@ -15880,16 +15880,22 @@ 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>>,
struct ordered_map : std::vector<typename Allocator::value_type, Allocator> class Container = std::vector<std::pair<const Key, T>, Allocator>>
struct ordered_map : Container
{ {
using Container = std::vector<typename Allocator::value_type, Allocator>;
using key_type = Key; using key_type = Key;
using mapped_type = T; using mapped_type = T;
using typename Container::iterator; using typename Container::iterator;
using typename Container::value_type;
using typename Container::size_type; using typename Container::size_type;
using Container::Container; using typename Container::value_type;
// Explicit constructors instead of `using Container::Container`
// otherwise older compilers like GCC 5.5 choke on it
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} {}
std::pair<iterator, bool> emplace(key_type&& key, T&& t) std::pair<iterator, bool> emplace(key_type&& key, T&& t)
{ {