1diff --git a/src/google/protobuf/generated_message_tctable_impl.h b/src/google/protobuf/generated_message_tctable_impl.h 2index 441a4293a9985..147c7727afd04 100644 3--- a/src/google/protobuf/generated_message_tctable_impl.h 4+++ b/src/google/protobuf/generated_message_tctable_impl.h 5@@ -183,48 +183,48 @@ static_assert(kFmtShift + kFmtBits <= 16, "too many bits"); 6 // Convenience aliases (16 bits, with format): 7 enum FieldType : uint16_t { 8 // Numeric types: 9- kBool = kFkVarint | kRep8Bits, 10- 11- kFixed32 = kFkFixed | kRep32Bits | kFmtUnsigned, 12- kUInt32 = kFkVarint | kRep32Bits | kFmtUnsigned, 13- kSFixed32 = kFkFixed | kRep32Bits | kFmtSigned, 14- kInt32 = kFkVarint | kRep32Bits | kFmtSigned, 15- kSInt32 = kFkVarint | kRep32Bits | kFmtSigned | kTvZigZag, 16- kFloat = kFkFixed | kRep32Bits | kFmtFloating, 17- kEnum = kFkVarint | kRep32Bits | kFmtEnum | kTvEnum, 18- kEnumRange = kFkVarint | kRep32Bits | kFmtEnum | kTvRange, 19- kOpenEnum = kFkVarint | kRep32Bits | kFmtEnum, 20- 21- kFixed64 = kFkFixed | kRep64Bits | kFmtUnsigned, 22- kUInt64 = kFkVarint | kRep64Bits | kFmtUnsigned, 23- kSFixed64 = kFkFixed | kRep64Bits | kFmtSigned, 24- kInt64 = kFkVarint | kRep64Bits | kFmtSigned, 25- kSInt64 = kFkVarint | kRep64Bits | kFmtSigned | kTvZigZag, 26- kDouble = kFkFixed | kRep64Bits | kFmtFloating, 27- 28- kPackedBool = kFkPackedVarint | kRep8Bits, 29- 30- kPackedFixed32 = kFkPackedFixed | kRep32Bits | kFmtUnsigned, 31- kPackedUInt32 = kFkPackedVarint | kRep32Bits | kFmtUnsigned, 32- kPackedSFixed32 = kFkPackedFixed | kRep32Bits | kFmtSigned, 33- kPackedInt32 = kFkPackedVarint | kRep32Bits | kFmtSigned, 34- kPackedSInt32 = kFkPackedVarint | kRep32Bits | kFmtSigned | kTvZigZag, 35- kPackedFloat = kFkPackedFixed | kRep32Bits | kFmtFloating, 36- kPackedEnum = kFkPackedVarint | kRep32Bits | kFmtEnum | kTvEnum, 37- kPackedEnumRange = kFkPackedVarint | kRep32Bits | kFmtEnum | kTvRange, 38- kPackedOpenEnum = kFkPackedVarint | kRep32Bits | kFmtEnum, 39- 40- kPackedFixed64 = kFkPackedFixed | kRep64Bits | kFmtUnsigned, 41- kPackedUInt64 = kFkPackedVarint | kRep64Bits | kFmtUnsigned, 42- kPackedSFixed64 = kFkPackedFixed | kRep64Bits | kFmtSigned, 43- kPackedInt64 = kFkPackedVarint | kRep64Bits | kFmtSigned, 44- kPackedSInt64 = kFkPackedVarint | kRep64Bits | kFmtSigned | kTvZigZag, 45- kPackedDouble = kFkPackedFixed | kRep64Bits | kFmtFloating, 46+ kBool = 0 | kFkVarint | kRep8Bits, 47+ 48+ kFixed32 = 0 | kFkFixed | kRep32Bits | kFmtUnsigned, 49+ kUInt32 = 0 | kFkVarint | kRep32Bits | kFmtUnsigned, 50+ kSFixed32 = 0 | kFkFixed | kRep32Bits | kFmtSigned, 51+ kInt32 = 0 | kFkVarint | kRep32Bits | kFmtSigned, 52+ kSInt32 = 0 | kFkVarint | kRep32Bits | kFmtSigned | kTvZigZag, 53+ kFloat = 0 | kFkFixed | kRep32Bits | kFmtFloating, 54+ kEnum = 0 | kFkVarint | kRep32Bits | kFmtEnum | kTvEnum, 55+ kEnumRange = 0 | kFkVarint | kRep32Bits | kFmtEnum | kTvRange, 56+ kOpenEnum = 0 | kFkVarint | kRep32Bits | kFmtEnum, 57+ 58+ kFixed64 = 0 | kFkFixed | kRep64Bits | kFmtUnsigned, 59+ kUInt64 = 0 | kFkVarint | kRep64Bits | kFmtUnsigned, 60+ kSFixed64 = 0 | kFkFixed | kRep64Bits | kFmtSigned, 61+ kInt64 = 0 | kFkVarint | kRep64Bits | kFmtSigned, 62+ kSInt64 = 0 | kFkVarint | kRep64Bits | kFmtSigned | kTvZigZag, 63+ kDouble = 0 | kFkFixed | kRep64Bits | kFmtFloating, 64+ 65+ kPackedBool = 0 | kFkPackedVarint | kRep8Bits, 66+ 67+ kPackedFixed32 = 0 | kFkPackedFixed | kRep32Bits | kFmtUnsigned, 68+ kPackedUInt32 = 0 | kFkPackedVarint | kRep32Bits | kFmtUnsigned, 69+ kPackedSFixed32 = 0 | kFkPackedFixed | kRep32Bits | kFmtSigned, 70+ kPackedInt32 = 0 | kFkPackedVarint | kRep32Bits | kFmtSigned, 71+ kPackedSInt32 = 0 | kFkPackedVarint | kRep32Bits | kFmtSigned | kTvZigZag, 72+ kPackedFloat = 0 | kFkPackedFixed | kRep32Bits | kFmtFloating, 73+ kPackedEnum = 0 | kFkPackedVarint | kRep32Bits | kFmtEnum | kTvEnum, 74+ kPackedEnumRange = 0 | kFkPackedVarint | kRep32Bits | kFmtEnum | kTvRange, 75+ kPackedOpenEnum = 0 | kFkPackedVarint | kRep32Bits | kFmtEnum, 76+ 77+ kPackedFixed64 = 0 | kFkPackedFixed | kRep64Bits | kFmtUnsigned, 78+ kPackedUInt64 = 0 | kFkPackedVarint | kRep64Bits | kFmtUnsigned, 79+ kPackedSFixed64 = 0 | kFkPackedFixed | kRep64Bits | kFmtSigned, 80+ kPackedInt64 = 0 | kFkPackedVarint | kRep64Bits | kFmtSigned, 81+ kPackedSInt64 = 0 | kFkPackedVarint | kRep64Bits | kFmtSigned | kTvZigZag, 82+ kPackedDouble = 0 | kFkPackedFixed | kRep64Bits | kFmtFloating, 83 84 // String types: 85- kBytes = kFkString | kFmtArray, 86- kRawString = kFkString | kFmtUtf8 | kTvUtf8Debug, 87- kUtf8String = kFkString | kFmtUtf8 | kTvUtf8, 88+ kBytes = 0 | kFkString | kFmtArray, 89+ kRawString = 0 | kFkString | kFmtUtf8 | kTvUtf8Debug, 90+ kUtf8String = 0 | kFkString | kFmtUtf8 | kTvUtf8, 91 92 // Message types: 93 kMessage = kFkMessage, 94@@ -232,7 +232,6 @@ enum FieldType : uint16_t { 95 // Map types: 96 kMap = kFkMap, 97 }; 98- 99 // clang-format on 100 } // namespace field_layout 101 102diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc 103index 82d46531f2f55..bec0cabeff8cf 100644 104--- a/src/google/protobuf/stubs/common.cc 105+++ b/src/google/protobuf/stubs/common.cc 106@@ -178,7 +178,7 @@ void NullLogHandler(LogLevel /* level */, const char* /* filename */, 107 } 108 109 static LogHandler* log_handler_ = &DefaultLogHandler; 110-static std::atomic<int> log_silencer_count_ = ATOMIC_VAR_INIT(0); 111+static std::atomic<int> log_silencer_count_{0}; 112 113 LogMessage& LogMessage::operator<<(const std::string& value) { 114 message_ += value; 115