115 lines
5.7 KiB
Diff
115 lines
5.7 KiB
Diff
diff --git a/src/google/protobuf/generated_message_tctable_impl.h b/src/google/protobuf/generated_message_tctable_impl.h
|
|
index 441a4293a9985..147c7727afd04 100644
|
|
--- a/src/google/protobuf/generated_message_tctable_impl.h
|
|
+++ b/src/google/protobuf/generated_message_tctable_impl.h
|
|
@@ -183,48 +183,48 @@ static_assert(kFmtShift + kFmtBits <= 16, "too many bits");
|
|
// Convenience aliases (16 bits, with format):
|
|
enum FieldType : uint16_t {
|
|
// Numeric types:
|
|
- kBool = kFkVarint | kRep8Bits,
|
|
-
|
|
- kFixed32 = kFkFixed | kRep32Bits | kFmtUnsigned,
|
|
- kUInt32 = kFkVarint | kRep32Bits | kFmtUnsigned,
|
|
- kSFixed32 = kFkFixed | kRep32Bits | kFmtSigned,
|
|
- kInt32 = kFkVarint | kRep32Bits | kFmtSigned,
|
|
- kSInt32 = kFkVarint | kRep32Bits | kFmtSigned | kTvZigZag,
|
|
- kFloat = kFkFixed | kRep32Bits | kFmtFloating,
|
|
- kEnum = kFkVarint | kRep32Bits | kFmtEnum | kTvEnum,
|
|
- kEnumRange = kFkVarint | kRep32Bits | kFmtEnum | kTvRange,
|
|
- kOpenEnum = kFkVarint | kRep32Bits | kFmtEnum,
|
|
-
|
|
- kFixed64 = kFkFixed | kRep64Bits | kFmtUnsigned,
|
|
- kUInt64 = kFkVarint | kRep64Bits | kFmtUnsigned,
|
|
- kSFixed64 = kFkFixed | kRep64Bits | kFmtSigned,
|
|
- kInt64 = kFkVarint | kRep64Bits | kFmtSigned,
|
|
- kSInt64 = kFkVarint | kRep64Bits | kFmtSigned | kTvZigZag,
|
|
- kDouble = kFkFixed | kRep64Bits | kFmtFloating,
|
|
-
|
|
- kPackedBool = kFkPackedVarint | kRep8Bits,
|
|
-
|
|
- kPackedFixed32 = kFkPackedFixed | kRep32Bits | kFmtUnsigned,
|
|
- kPackedUInt32 = kFkPackedVarint | kRep32Bits | kFmtUnsigned,
|
|
- kPackedSFixed32 = kFkPackedFixed | kRep32Bits | kFmtSigned,
|
|
- kPackedInt32 = kFkPackedVarint | kRep32Bits | kFmtSigned,
|
|
- kPackedSInt32 = kFkPackedVarint | kRep32Bits | kFmtSigned | kTvZigZag,
|
|
- kPackedFloat = kFkPackedFixed | kRep32Bits | kFmtFloating,
|
|
- kPackedEnum = kFkPackedVarint | kRep32Bits | kFmtEnum | kTvEnum,
|
|
- kPackedEnumRange = kFkPackedVarint | kRep32Bits | kFmtEnum | kTvRange,
|
|
- kPackedOpenEnum = kFkPackedVarint | kRep32Bits | kFmtEnum,
|
|
-
|
|
- kPackedFixed64 = kFkPackedFixed | kRep64Bits | kFmtUnsigned,
|
|
- kPackedUInt64 = kFkPackedVarint | kRep64Bits | kFmtUnsigned,
|
|
- kPackedSFixed64 = kFkPackedFixed | kRep64Bits | kFmtSigned,
|
|
- kPackedInt64 = kFkPackedVarint | kRep64Bits | kFmtSigned,
|
|
- kPackedSInt64 = kFkPackedVarint | kRep64Bits | kFmtSigned | kTvZigZag,
|
|
- kPackedDouble = kFkPackedFixed | kRep64Bits | kFmtFloating,
|
|
+ kBool = 0 | kFkVarint | kRep8Bits,
|
|
+
|
|
+ kFixed32 = 0 | kFkFixed | kRep32Bits | kFmtUnsigned,
|
|
+ kUInt32 = 0 | kFkVarint | kRep32Bits | kFmtUnsigned,
|
|
+ kSFixed32 = 0 | kFkFixed | kRep32Bits | kFmtSigned,
|
|
+ kInt32 = 0 | kFkVarint | kRep32Bits | kFmtSigned,
|
|
+ kSInt32 = 0 | kFkVarint | kRep32Bits | kFmtSigned | kTvZigZag,
|
|
+ kFloat = 0 | kFkFixed | kRep32Bits | kFmtFloating,
|
|
+ kEnum = 0 | kFkVarint | kRep32Bits | kFmtEnum | kTvEnum,
|
|
+ kEnumRange = 0 | kFkVarint | kRep32Bits | kFmtEnum | kTvRange,
|
|
+ kOpenEnum = 0 | kFkVarint | kRep32Bits | kFmtEnum,
|
|
+
|
|
+ kFixed64 = 0 | kFkFixed | kRep64Bits | kFmtUnsigned,
|
|
+ kUInt64 = 0 | kFkVarint | kRep64Bits | kFmtUnsigned,
|
|
+ kSFixed64 = 0 | kFkFixed | kRep64Bits | kFmtSigned,
|
|
+ kInt64 = 0 | kFkVarint | kRep64Bits | kFmtSigned,
|
|
+ kSInt64 = 0 | kFkVarint | kRep64Bits | kFmtSigned | kTvZigZag,
|
|
+ kDouble = 0 | kFkFixed | kRep64Bits | kFmtFloating,
|
|
+
|
|
+ kPackedBool = 0 | kFkPackedVarint | kRep8Bits,
|
|
+
|
|
+ kPackedFixed32 = 0 | kFkPackedFixed | kRep32Bits | kFmtUnsigned,
|
|
+ kPackedUInt32 = 0 | kFkPackedVarint | kRep32Bits | kFmtUnsigned,
|
|
+ kPackedSFixed32 = 0 | kFkPackedFixed | kRep32Bits | kFmtSigned,
|
|
+ kPackedInt32 = 0 | kFkPackedVarint | kRep32Bits | kFmtSigned,
|
|
+ kPackedSInt32 = 0 | kFkPackedVarint | kRep32Bits | kFmtSigned | kTvZigZag,
|
|
+ kPackedFloat = 0 | kFkPackedFixed | kRep32Bits | kFmtFloating,
|
|
+ kPackedEnum = 0 | kFkPackedVarint | kRep32Bits | kFmtEnum | kTvEnum,
|
|
+ kPackedEnumRange = 0 | kFkPackedVarint | kRep32Bits | kFmtEnum | kTvRange,
|
|
+ kPackedOpenEnum = 0 | kFkPackedVarint | kRep32Bits | kFmtEnum,
|
|
+
|
|
+ kPackedFixed64 = 0 | kFkPackedFixed | kRep64Bits | kFmtUnsigned,
|
|
+ kPackedUInt64 = 0 | kFkPackedVarint | kRep64Bits | kFmtUnsigned,
|
|
+ kPackedSFixed64 = 0 | kFkPackedFixed | kRep64Bits | kFmtSigned,
|
|
+ kPackedInt64 = 0 | kFkPackedVarint | kRep64Bits | kFmtSigned,
|
|
+ kPackedSInt64 = 0 | kFkPackedVarint | kRep64Bits | kFmtSigned | kTvZigZag,
|
|
+ kPackedDouble = 0 | kFkPackedFixed | kRep64Bits | kFmtFloating,
|
|
|
|
// String types:
|
|
- kBytes = kFkString | kFmtArray,
|
|
- kRawString = kFkString | kFmtUtf8 | kTvUtf8Debug,
|
|
- kUtf8String = kFkString | kFmtUtf8 | kTvUtf8,
|
|
+ kBytes = 0 | kFkString | kFmtArray,
|
|
+ kRawString = 0 | kFkString | kFmtUtf8 | kTvUtf8Debug,
|
|
+ kUtf8String = 0 | kFkString | kFmtUtf8 | kTvUtf8,
|
|
|
|
// Message types:
|
|
kMessage = kFkMessage,
|
|
@@ -232,7 +232,6 @@ enum FieldType : uint16_t {
|
|
// Map types:
|
|
kMap = kFkMap,
|
|
};
|
|
-
|
|
// clang-format on
|
|
} // namespace field_layout
|
|
|
|
diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc
|
|
index 82d46531f2f55..bec0cabeff8cf 100644
|
|
--- a/src/google/protobuf/stubs/common.cc
|
|
+++ b/src/google/protobuf/stubs/common.cc
|
|
@@ -178,7 +178,7 @@ void NullLogHandler(LogLevel /* level */, const char* /* filename */,
|
|
}
|
|
|
|
static LogHandler* log_handler_ = &DefaultLogHandler;
|
|
-static std::atomic<int> log_silencer_count_ = ATOMIC_VAR_INIT(0);
|
|
+static std::atomic<int> log_silencer_count_{0};
|
|
|
|
LogMessage& LogMessage::operator<<(const std::string& value) {
|
|
message_ += value;
|