Merge pull request #10385 from marjoleinheyndrickx/main

Fix Wpedantic warning 'extra ;' for c++
protocolbuffers · Aug 17, 2022 · 4dbf4e5 · 4dbf4e5
2 parents bc1b310 + 8335ad0
commit 4dbf4e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h
@@ -199,7 +199,7 @@ namespace internal {
 //
 
 #if !defined(PROTOBUF_INTERNAL_CHECK_CLASS_SIZE)
-#define PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(t, expected)
+#define PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(t, expected) static_assert(true, "")
 #endif
 
 class FlatAllocator;

diff --git a/src/google/protobuf/parse_context.h b/src/google/protobuf/parse_context.h
@@ -636,7 +636,7 @@ RotRight7AndReplaceLowByte(uint64_t res, const char& byte) {
   res |= 0xFF & byte;
 #endif
   return res;
-};
+}
 
 inline PROTOBUF_ALWAYS_INLINE
 const char* ReadTagInlined(const char* ptr, uint32_t* out) {