Revert "Fix some unused parameter warnings"

This reverts commit b245073ab81c52ff250516355d62cc494810e845.

These have been fixed upstream.

Bug: 117607748
Test: m checkbuild
Change-Id: Ide43333d2075635b0ddcf83bf757f802b1df99c4
Merged-In: Ide43333d2075635b0ddcf83bf757f802b1df99c4

2 files changed, 5 insertions, 5 deletions

diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h
index b4344da14..c2abf9979 100644
--- a/src/google/protobuf/arena.h
+++ b/src/google/protobuf/arena.h
@@ -800,13 +800,13 @@ class LIBPROTOBUF_EXPORT Arena {
   }
   template <typename T>
   static void CreateInArenaStorageInternal(
-      T* ptr, Arena*, google::protobuf::internal::false_type) {
+      T* ptr, Arena* arena, google::protobuf::internal::false_type) {
     new (ptr) T;
   }
 
   template <typename T>
   static void RegisterDestructorInternal(
-      T*, Arena*, google::protobuf::internal::true_type) {}
+      T* ptr, Arena* arena, google::protobuf::internal::true_type) {}
   template <typename T>
   static void RegisterDestructorInternal(
       T* ptr, Arena* arena, google::protobuf::internal::false_type) {
@@ -841,7 +841,7 @@ class LIBPROTOBUF_EXPORT Arena {
   }
 
   template<typename T> GOOGLE_ATTRIBUTE_ALWAYS_INLINE
-  static ::google::protobuf::Arena* GetArenaInternal(const T*, ...) {
+  static ::google::protobuf::Arena* GetArenaInternal(const T* value, ...) {
     return NULL;
   }
 
diff --git a/src/google/protobuf/stubs/shared_ptr.h b/src/google/protobuf/stubs/shared_ptr.h
index bca8280d4..393249ff8 100644
--- a/src/google/protobuf/stubs/shared_ptr.h
+++ b/src/google/protobuf/stubs/shared_ptr.h
@@ -438,8 +438,8 @@ class enable_shared_from_this {
 
  protected:
   enable_shared_from_this() { }
-  enable_shared_from_this(const enable_shared_from_this&) { }
-  enable_shared_from_this& operator=(const enable_shared_from_this&) {
+  enable_shared_from_this(const enable_shared_from_this& other) { }
+  enable_shared_from_this& operator=(const enable_shared_from_this& other) {
     return *this;
   }
   ~enable_shared_from_this() { }