mirror/ctemplate
1
0
Fork 0
mirror of https://github.com/OlafvdSpek/ctemplate.git synced 2025-09-28 19:05:49 +08:00
Code Issues Releases Wiki Activity

C++20 / gcc10 fix: remove hint, removed typedef

Browse Source 
C++17 deprecated, and C++20 fully removed, the std::allocator<T>::const_pointer typedef (https://en.cppreference.com/w/cpp/memory/allocator). So gcc10 fails to compile this file.

The selected fix was to completely remove the hint argument because (a) it was ignored anyway, and (b) std::allocator's allocate() function also chose to remove its hint argument in C++20 (https://en.cppreference.com/w/cpp/memory/allocator/allocate).
This commit is contained in:
Conrad Poelman 2020-05-11 21:55:00 -04:00 committed by GitHub
parent 20933752f7
commit 5aa5a00e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/base/arena-inl.h
View File

@ -93,8 +93,7 @@ template <class T, class C> class ArenaAllocator {
ArenaAllocator(C* arena) : arena_(arena) { } // NOLINT ArenaAllocator(C* arena) : arena_(arena) { } // NOLINT
~ArenaAllocator() { } ~ArenaAllocator() { }
pointer allocate(size_type n, pointer allocate(size_type n) {
std::allocator<void>::const_pointer /*hint*/ = 0) {
assert(arena_ && "No arena to allocate from!"); assert(arena_ && "No arena to allocate from!");
return reinterpret_cast<T*>(arena_->AllocAligned(n * sizeof(T), return reinterpret_cast<T*>(arena_->AllocAligned(n * sizeof(T),
kAlignment)); kAlignment));