for old clang build issue, related with https://reviews.llvm.org/D12375 (#9159)

This seems wrong: given [[foo]] [[bar]], we'll now parse the second one as an MS attribute in a context where both are allowed.
pull/9170/head
appledragon 3 years ago committed by GitHub
parent 9c3af64ae4
commit 1d2e8d9302
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 34
      src/google/protobuf/parse_context.h

@ -787,7 +787,7 @@ inline bool VerifyUTF8(const std::string* s, const char* field_name) {
}
// All the string parsers with or without UTF checking and for all CTypes.
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* InlineGreedyStringParser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* InlineGreedyStringParser(
std::string* s, const char* ptr, ParseContext* ctx);
@ -859,19 +859,19 @@ PROTOBUF_NODISCARD const char* WireFormatParser(T& field_parser,
// corresponding field
// These are packed varints
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedInt32Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedInt32Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedUInt32Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedUInt32Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedInt64Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedInt64Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedUInt64Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedUInt64Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedSInt32Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedSInt32Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedSInt64Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedSInt64Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedEnumParser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedEnumParser(
void* object, const char* ptr, ParseContext* ctx);
template <typename T>
@ -905,28 +905,28 @@ PROTOBUF_NODISCARD const char* PackedEnumParserArg(
});
}
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedBoolParser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedBoolParser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedFixed32Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedFixed32Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedSFixed32Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedSFixed32Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedFixed64Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedFixed64Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedSFixed64Parser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedSFixed64Parser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedFloatParser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedFloatParser(
void* object, const char* ptr, ParseContext* ctx);
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* PackedDoubleParser(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedDoubleParser(
void* object, const char* ptr, ParseContext* ctx);
// This is the only recursive parser.
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* UnknownGroupLiteParse(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* UnknownGroupLiteParse(
std::string* unknown, const char* ptr, ParseContext* ctx);
// This is a helper to for the UnknownGroupLiteParse but is actually also
// useful in the generated code. It uses overload on std::string* vs
// UnknownFieldSet* to make the generated code isomorphic between full and lite.
PROTOBUF_EXPORT PROTOBUF_NODISCARD const char* UnknownFieldParse(
PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* UnknownFieldParse(
uint32_t tag, std::string* unknown, const char* ptr, ParseContext* ctx);
} // namespace internal

Loading…
Cancel
Save