Merge "ART: Fix "unused parameters""

3 files changed, 15 insertions, 15 deletions

diff --git a/runtime/base/arena_containers.h b/runtime/base/arena_containers.h
index 162eb16d49..ceff6e85a3 100644
--- a/runtime/base/arena_containers.h
+++ b/runtime/base/arena_containers.h
@@ -66,8 +66,8 @@ template <>
 class ArenaAllocatorAdapterKindImpl<false> {
  public:
   // Not tracking allocations, ignore the supplied kind and arbitrarily provide kArenaAllocSTL.
-  explicit ArenaAllocatorAdapterKindImpl(ArenaAllocKind kind) { UNUSED(kind); }
-  ArenaAllocatorAdapterKindImpl& operator=(const ArenaAllocatorAdapterKindImpl& other) = default;
+  explicit ArenaAllocatorAdapterKindImpl(ArenaAllocKind kind ATTRIBUTE_UNUSED) {}
+  ArenaAllocatorAdapterKindImpl& operator=(const ArenaAllocatorAdapterKindImpl&) = default;
   ArenaAllocKind Kind() { return kArenaAllocSTL; }
 };
 
@@ -75,7 +75,7 @@ template <bool kCount>
 class ArenaAllocatorAdapterKindImpl {
  public:
   explicit ArenaAllocatorAdapterKindImpl(ArenaAllocKind kind) : kind_(kind) { }
-  ArenaAllocatorAdapterKindImpl& operator=(const ArenaAllocatorAdapterKindImpl& other) = default;
+  ArenaAllocatorAdapterKindImpl& operator=(const ArenaAllocatorAdapterKindImpl&) = default;
   ArenaAllocKind Kind() { return kind_; }
 
  private:
@@ -109,8 +109,8 @@ class ArenaAllocatorAdapter<void>
         ArenaAllocatorAdapterKind(other),
         arena_allocator_(other.arena_allocator_) {
   }
-  ArenaAllocatorAdapter(const ArenaAllocatorAdapter& other) = default;
-  ArenaAllocatorAdapter& operator=(const ArenaAllocatorAdapter& other) = default;
+  ArenaAllocatorAdapter(const ArenaAllocatorAdapter&) = default;
+  ArenaAllocatorAdapter& operator=(const ArenaAllocatorAdapter&) = default;
   ~ArenaAllocatorAdapter() = default;
 
  private:
@@ -147,8 +147,8 @@ class ArenaAllocatorAdapter : private DebugStackReference, private ArenaAllocato
         ArenaAllocatorAdapterKind(other),
         arena_allocator_(other.arena_allocator_) {
   }
-  ArenaAllocatorAdapter(const ArenaAllocatorAdapter& other) = default;
-  ArenaAllocatorAdapter& operator=(const ArenaAllocatorAdapter& other) = default;
+  ArenaAllocatorAdapter(const ArenaAllocatorAdapter&) = default;
+  ArenaAllocatorAdapter& operator=(const ArenaAllocatorAdapter&) = default;
   ~ArenaAllocatorAdapter() = default;
 
   size_type max_size() const {
diff --git a/runtime/base/scoped_arena_containers.h b/runtime/base/scoped_arena_containers.h
index 664a909e5f..df79085626 100644
--- a/runtime/base/scoped_arena_containers.h
+++ b/runtime/base/scoped_arena_containers.h
@@ -85,8 +85,8 @@ class ScopedArenaAllocatorAdapter<void>
         ArenaAllocatorAdapterKind(other),
         arena_stack_(other.arena_stack_) {
   }
-  ScopedArenaAllocatorAdapter(const ScopedArenaAllocatorAdapter& other) = default;
-  ScopedArenaAllocatorAdapter& operator=(const ScopedArenaAllocatorAdapter& other) = default;
+  ScopedArenaAllocatorAdapter(const ScopedArenaAllocatorAdapter&) = default;
+  ScopedArenaAllocatorAdapter& operator=(const ScopedArenaAllocatorAdapter&) = default;
   ~ScopedArenaAllocatorAdapter() = default;
 
  private:
@@ -128,8 +128,8 @@ class ScopedArenaAllocatorAdapter
         ArenaAllocatorAdapterKind(other),
         arena_stack_(other.arena_stack_) {
   }
-  ScopedArenaAllocatorAdapter(const ScopedArenaAllocatorAdapter& other) = default;
-  ScopedArenaAllocatorAdapter& operator=(const ScopedArenaAllocatorAdapter& other) = default;
+  ScopedArenaAllocatorAdapter(const ScopedArenaAllocatorAdapter&) = default;
+  ScopedArenaAllocatorAdapter& operator=(const ScopedArenaAllocatorAdapter&) = default;
   ~ScopedArenaAllocatorAdapter() = default;
 
   size_type max_size() const {
diff --git a/runtime/base/variant_map.h b/runtime/base/variant_map.h
index c9718fcdd0..8655a9e2e8 100644
--- a/runtime/base/variant_map.h
+++ b/runtime/base/variant_map.h
@@ -120,8 +120,8 @@ namespace detail {
 
    protected:
     // Avoid the object slicing problem; use Clone() instead.
-    VariantMapKeyRaw(const VariantMapKeyRaw& other) = default;
-    VariantMapKeyRaw(VariantMapKeyRaw&& other) = default;
+    VariantMapKeyRaw(const VariantMapKeyRaw&) = default;
+    VariantMapKeyRaw(VariantMapKeyRaw&&) = default;
 
    private:
     size_t key_counter_;  // Runtime type ID. Unique each time a new type is reified.
@@ -174,8 +174,8 @@ struct VariantMapKey : detail::VariantMapKeyRaw {
     deleter(reinterpret_cast<TValue*>(value));
   }
 
-  VariantMapKey(const VariantMapKey& other) = default;
-  VariantMapKey(VariantMapKey&& other) = default;
+  VariantMapKey(const VariantMapKey&) = default;
+  VariantMapKey(VariantMapKey&&) = default;
 
   template <typename Base, template <typename TV> class TKey> friend struct VariantMap;