diff options
author | Andreas Gampe <agampe@google.com> | 2015-04-03 21:28:42 -0700 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2015-04-06 14:03:17 -0700 |
commit | 758a801b66c134361a7b43f7e83f85d1fb800c4c (patch) | |
tree | 35b060c780fcf6e7c268fec47df40c74b5ab8b05 /runtime/base | |
parent | e8aae00fa400efbb8f998a5dbf68eb42810889c1 (diff) | |
download | art-758a801b66c134361a7b43f7e83f85d1fb800c4c.zip art-758a801b66c134361a7b43f7e83f85d1fb800c4c.tar.gz art-758a801b66c134361a7b43f7e83f85d1fb800c4c.tar.bz2 |
ART: Enable Clang's -Wdeprecated
Replace throw() with noexcept.
Add default copy constructors and copy assignment constructors for
cases with destructors, as the implicit definition is deprecated.
Change-Id: Ice306a3f510b072b00bec4d4360f7c8055135c9d
Diffstat (limited to 'runtime/base')
-rw-r--r-- | runtime/base/allocator.h | 4 | ||||
-rw-r--r-- | runtime/base/arena_containers.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/runtime/base/allocator.h b/runtime/base/allocator.h index 2d67c8b..07daa7e 100644 --- a/runtime/base/allocator.h +++ b/runtime/base/allocator.h @@ -114,12 +114,12 @@ class TrackingAllocatorImpl : public std::allocator<T> { // Used internally by STL data structures. template <class U> - TrackingAllocatorImpl(const TrackingAllocatorImpl<U, kTag>& alloc) throw() { + TrackingAllocatorImpl(const TrackingAllocatorImpl<U, kTag>& alloc) noexcept { UNUSED(alloc); } // Used internally by STL data structures. - TrackingAllocatorImpl() throw() { + TrackingAllocatorImpl() noexcept { static_assert(kTag < kAllocatorTagCount, "kTag must be less than kAllocatorTagCount"); } diff --git a/runtime/base/arena_containers.h b/runtime/base/arena_containers.h index e6fe6c0..d6c4a54 100644 --- a/runtime/base/arena_containers.h +++ b/runtime/base/arena_containers.h @@ -67,6 +67,7 @@ class ArenaAllocatorAdapterKindImpl<false> { public: // Not tracking allocations, ignore the supplied kind and arbitrarily provide kArenaAllocSTL. explicit ArenaAllocatorAdapterKindImpl(ArenaAllocKind kind ATTRIBUTE_UNUSED) {} + ArenaAllocatorAdapterKindImpl(const ArenaAllocatorAdapterKindImpl&) = default; ArenaAllocatorAdapterKindImpl& operator=(const ArenaAllocatorAdapterKindImpl&) = default; ArenaAllocKind Kind() { return kArenaAllocSTL; } }; |