Merge pull request #10390 from marjoleinheyndrickx/wunused-parameters

avoid unused-parameter warning for c++
2 years ago · 3919d23391
parent 4dbf4e5e26 da05f11cfe
commit 3919d23391
1 changed files with 2 additions and 0 deletions
--- a/src/google/protobuf/arena.h
+++ b/src/google/protobuf/arena.h
@ -438,6 +438,7 @@ class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {

    template <typename U>
    static Arena* GetOwningArena(Rank1, const U* p) {
+      (void) p;
      return nullptr;
    }

@ -468,6 +469,7 @@ class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {

    template <typename U>
    static Arena* GetArenaForAllocation(Rank2, const U* p) {
+      (void) p;
      return nullptr;
    }