diff options
author | Vitaly Buka <vitalybuka@google.com> | 2019-05-01 19:36:26 +0000 |
---|---|---|
committer | Vitaly Buka <vitalybuka@google.com> | 2019-05-01 19:36:26 +0000 |
commit | 602be703dd35567968f1c4567332eade87e93597 (patch) | |
tree | dbb17798eadcbe4fe3f4faf5fcd42d9b2361ce5d /lib | |
parent | 8b0927fbbaa2dd437b3f189b357990dd3d06c694 (diff) | |
download | compiler-rt-602be703dd35567968f1c4567332eade87e93597.tar.gz |
[scudo][NFC] Remove unneeded template from scudo::CombinedAllocator
Reviewers: cryptoad, eugenis
Reviewed By: cryptoad
Subscribers: #sanitizers, llvm-commits
Tags: #sanitizers, #llvm
Differential Revision: https://reviews.llvm.org/D61162
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@359718 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/scudo/scudo_allocator.h | 8 | ||||
-rw-r--r-- | lib/scudo/scudo_allocator_combined.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/scudo/scudo_allocator.h b/lib/scudo/scudo_allocator.h index 7a92e4142..0efa5c520 100644 --- a/lib/scudo/scudo_allocator.h +++ b/lib/scudo/scudo_allocator.h @@ -100,11 +100,13 @@ typedef SizeClassAllocator32<AP32> PrimaryT; #endif // SANITIZER_CAN_USE_ALLOCATOR64 #include "scudo_allocator_secondary.h" -#include "scudo_allocator_combined.h" typedef LargeMmapAllocator SecondaryT; -typedef CombinedAllocator<PrimaryT, SecondaryT> BackendT; -typedef BackendT::AllocatorCache AllocatorCacheT; + +#include "scudo_allocator_combined.h" + +typedef CombinedAllocator BackendT; +typedef CombinedAllocator::AllocatorCache AllocatorCacheT; void initScudo(); diff --git a/lib/scudo/scudo_allocator_combined.h b/lib/scudo/scudo_allocator_combined.h index 4e9217cdd..d61cc9ec1 100644 --- a/lib/scudo/scudo_allocator_combined.h +++ b/lib/scudo/scudo_allocator_combined.h @@ -18,9 +18,10 @@ # error "This file must be included inside scudo_allocator.h." #endif -template <class PrimaryAllocator, class SecondaryAllocator> class CombinedAllocator { public: + using PrimaryAllocator = PrimaryT; + using SecondaryAllocator = SecondaryT; using AllocatorCache = typename PrimaryAllocator::AllocatorCache; void init(s32 ReleaseToOSIntervalMs) { Primary.Init(ReleaseToOSIntervalMs); |