From e6f96cb2bd94df5bc05d763892805d4c1ced2fa8 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Tue, 20 Feb 2024 19:34:58 +1100 Subject: [PATCH] std::allocator::rebind is deprecated Clang should no longer scream --- source/core/StarFlatHashMap.hpp | 2 +- source/core/StarFlatHashTable.hpp | 2 +- source/core/StarOrderedMap.hpp | 2 +- source/core/StarOrderedSet.hpp | 4 ++-- 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::other> Table; + typedef FlatHashTable::template rebind_alloc> 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::other> Buckets; + typedef std::vector::template rebind_alloc> 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 OrderType; typedef Map< std::reference_wrapper, typename OrderType::iterator, MapArgs..., - typename Allocator::template rebind const, typename OrderType::iterator>>::other + typename std::allocator_traits::template rebind_alloc 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::other> OrderType; + typedef LinkedList::template rebind_alloc> OrderType; typedef Map< std::reference_wrapper, typename OrderType::const_iterator, Args..., - typename Allocator::template rebind const, typename OrderType::const_iterator>>::other + typename std::allocator_traits::template rebind_alloc const, typename OrderType::const_iterator>> > MapType; typedef typename OrderType::const_iterator const_iterator;