diff options
| author | 2017-02-07 18:25:32 +0000 | |
|---|---|---|
| committer | 2017-02-07 18:25:33 +0000 | |
| commit | 37f84f4e549a5dfdad66b81dfe22e54310292bd1 (patch) | |
| tree | d7a177b5a9aa5470cef2ced16e662304d3f3439e | |
| parent | f13eb66a9396b393b84d9fb77381865ad04f260f (diff) | |
| parent | 5f9da555e69e7a2e1b4cadd87bbdfcce54c1395d (diff) | |
Merge "Fix issues due to updated toolchain."
| -rw-r--r-- | runtime/base/arena_allocator.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/base/arena_allocator.cc b/runtime/base/arena_allocator.cc index 9fdb0cc9d0..db433194d3 100644 --- a/runtime/base/arena_allocator.cc +++ b/runtime/base/arena_allocator.cc @@ -146,7 +146,9 @@ void ArenaAllocatorStatsImpl<kCount>::Dump(std::ostream& os, const Arena* first, } #pragma GCC diagnostic push +#if __clang_major__ >= 4 #pragma GCC diagnostic ignored "-Winstantiation-after-specialization" +#endif // Explicitly instantiate the used implementation. template class ArenaAllocatorStatsImpl<kArenaAllocatorCountAllocations>; #pragma GCC diagnostic pop |