[PATCH] D61162: [scudo][NFC] Remove unneeded template from scudo::CombinedAllocator

[Vitaly Buka via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL359718: [scudo][NFC] Remove unneeded template from scudo::CombinedAllocator (authored by vitalybuka, committed by ).
Herald added a subscriber: delcypher.

Changed prior to commit:
  https://reviews.llvm.org/D61162?vs=196758&id=197615#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D61162/new/

https://reviews.llvm.org/D61162

Files:
  compiler-rt/trunk/lib/scudo/scudo_allocator.h
  compiler-rt/trunk/lib/scudo/scudo_allocator_combined.h


Index: compiler-rt/trunk/lib/scudo/scudo_allocator_combined.h
===================================================================
--- compiler-rt/trunk/lib/scudo/scudo_allocator_combined.h
+++ compiler-rt/trunk/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);
Index: compiler-rt/trunk/lib/scudo/scudo_allocator.h
===================================================================
--- compiler-rt/trunk/lib/scudo/scudo_allocator.h
+++ compiler-rt/trunk/lib/scudo/scudo_allocator.h
@@ -100,11 +100,13 @@
 #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();
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61162.197615.patch
Type: text/x-patch
Size: 1353 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190501/7d161f8a/attachment.bin>