diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-05-02 16:55:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-02 16:55:00 +0000 |
| commit | 6a6a5304e75a1af484975cedc832d0a80c3e5e61 (patch) | |
| tree | 547cc708e06e6541676b17066023ae6f07b2049b /runtime/gc | |
| parent | 56a341a82ece9aa4f2a071629f3e1fd1adf988ae (diff) | |
| parent | 8194963098247be6bca9cc4a54dbfa65c73e8ccc (diff) | |
| download | art-6a6a5304e75a1af484975cedc832d0a80c3e5e61.zip art-6a6a5304e75a1af484975cedc832d0a80c3e5e61.tar.gz art-6a6a5304e75a1af484975cedc832d0a80c3e5e61.tar.bz2 | |
Merge "Replace CountOneBits and __builtin_popcount with POPCOUNT."
Diffstat (limited to 'runtime/gc')
| -rw-r--r-- | runtime/gc/accounting/gc_allocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/accounting/gc_allocator.h b/runtime/gc/accounting/gc_allocator.h index 4fe9367..7dd7cca 100644 --- a/runtime/gc/accounting/gc_allocator.h +++ b/runtime/gc/accounting/gc_allocator.h @@ -73,7 +73,7 @@ class GcAllocatorImpl : public std::allocator<T> { // GCAllocatorImpl<T> if kMeasureGCMemoryOverhead is true, std::allocator<T> otherwise. template <typename T> class GcAllocator : public TypeStaticIf<kMeasureGcMemoryOverhead, GcAllocatorImpl<T>, - std::allocator<T> >::value { + std::allocator<T> >::type { }; } // namespace accounting |