Merge pull request #10385 from marjoleinheyndrickx/main

Fix Wpedantic warning 'extra ;' for c++
2 years ago · 4dbf4e5e26
parent bc1b31001d 8335ad01c8
commit 4dbf4e5e26
2 changed files with 2 additions and 2 deletions
--- 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;
--- 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) {