Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/core
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2024-02-20 19:34:58 +1100
committerKae <80987908+Novaenia@users.noreply.github.com>2024-02-20 19:34:58 +1100
commite6f96cb2bd94df5bc05d763892805d4c1ced2fa8 (patch)
treee108aa02fa7e46453628119310c8bf17e83742b8 /source/core
parent43b2fa53e7a6ba8bc220306fbe9bbda00076a520 (diff)
std::allocator::rebind is deprecated
Clang should no longer scream
Diffstat (limited to 'source/core')
-rw-r--r--source/core/StarFlatHashMap.hpp2
-rw-r--r--source/core/StarFlatHashTable.hpp2
-rw-r--r--source/core/StarOrderedMap.hpp2
-rw-r--r--source/core/StarOrderedSet.hpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/source/core/StarFlatHashMap.hpp b/source/core/StarFlatHashMap.hpp
index 111aa6b..7fd21ff 100644
--- a/source/core/StarFlatHashMap.hpp
+++ b/source/core/StarFlatHashMap.hpp
@@ -31,7 +31,7 @@ private:
key_type const& operator()(TableValue const& value) const;
};
- typedef FlatHashTable<TableValue, key_type, GetKey, Hash, Equals, typename Allocator::template rebind<TableValue>::other> Table;
+ typedef FlatHashTable<TableValue, key_type, GetKey, Hash, Equals, typename std::allocator_traits<Allocator>::template rebind_alloc<TableValue>> Table;
public:
struct const_iterator {
diff --git a/source/core/StarFlatHashTable.hpp b/source/core/StarFlatHashTable.hpp
index e9a8680..793c573 100644
--- a/source/core/StarFlatHashTable.hpp
+++ b/source/core/StarFlatHashTable.hpp
@@ -39,7 +39,7 @@ private:
size_t hash;
};
- typedef std::vector<Bucket, typename Allocator::template rebind<Bucket>::other> Buckets;
+ typedef std::vector<Bucket, typename std::allocator_traits<Allocator>::template rebind_alloc<Bucket>> Buckets;
public:
struct const_iterator {
diff --git a/source/core/StarOrderedMap.hpp b/source/core/StarOrderedMap.hpp
index be99769..50482bf 100644
--- a/source/core/StarOrderedMap.hpp
+++ b/source/core/StarOrderedMap.hpp
@@ -17,7 +17,7 @@ public:
typedef LinkedList<value_type, Allocator> OrderType;
typedef Map<
std::reference_wrapper<key_type const>, typename OrderType::iterator, MapArgs...,
- typename Allocator::template rebind<pair<std::reference_wrapper<key_type const> const, typename OrderType::iterator>>::other
+ typename std::allocator_traits<Allocator>::template rebind_alloc<pair<std::reference_wrapper<key_type const> const, typename OrderType::iterator>>
> MapType;
typedef typename OrderType::iterator iterator;
diff --git a/source/core/StarOrderedSet.hpp b/source/core/StarOrderedSet.hpp
index abfb19b..4645a38 100644
--- a/source/core/StarOrderedSet.hpp
+++ b/source/core/StarOrderedSet.hpp
@@ -14,10 +14,10 @@ class OrderedSetWrapper {
public:
typedef Value value_type;
- typedef LinkedList<value_type, typename Allocator::template rebind<value_type>::other> OrderType;
+ typedef LinkedList<value_type, typename std::allocator_traits<Allocator>::template rebind_alloc<value_type>> OrderType;
typedef Map<
std::reference_wrapper<value_type const>, typename OrderType::const_iterator, Args...,
- typename Allocator::template rebind<pair<std::reference_wrapper<value_type const> const, typename OrderType::const_iterator>>::other
+ typename std::allocator_traits<Allocator>::template rebind_alloc<pair<std::reference_wrapper<value_type const> const, typename OrderType::const_iterator>>
> MapType;
typedef typename OrderType::const_iterator const_iterator;