From 6e1d7a31bca0b90b648e78d459a1cbc7d621202a Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Thu, 17 Mar 2022 11:35:23 +0100 Subject: [PATCH] Fix build + typo --- src/Formats/ProtobufSchemas.h | 2 +- src/Formats/ProtobufSerializer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Formats/ProtobufSchemas.h b/src/Formats/ProtobufSchemas.h index f2c9c6f13e9..40e386b4642 100644 --- a/src/Formats/ProtobufSchemas.h +++ b/src/Formats/ProtobufSchemas.h @@ -57,7 +57,7 @@ public: /// Parses the format schema, then parses the corresponding proto file, and returns the descriptor of the message type. /// The function never returns nullptr, it throws an exception if it cannot load or parse the file. - const google::protobuf::Descriptor * getMessageTypeForFormatSchema(const FormatSchemaInfo & info, WithEnvelope withEnvelope); + const google::protobuf::Descriptor * getMessageTypeForFormatSchema(const FormatSchemaInfo & info, WithEnvelope with_envelope); private: class ImporterWithSourceTree; diff --git a/src/Formats/ProtobufSerializer.cpp b/src/Formats/ProtobufSerializer.cpp index 344c1cd506d..b44342d0ca5 100644 --- a/src/Formats/ProtobufSerializer.cpp +++ b/src/Formats/ProtobufSerializer.cpp @@ -2399,7 +2399,7 @@ namespace }; /// Serializes a top-level envelope message in the protobuf schema. - /// "Envelope" means that the contained subtree of serializers is encosed in a message just once, + /// "Envelope" means that the contained subtree of serializers is enclosed in a message just once, /// i.e. only when the first and the last row read/write trigger a read/write of the msg header. class ProtobufSerializerEnvelope : public ProtobufSerializer { @@ -2455,7 +2455,7 @@ namespace } int field_tag; - bool ret = reader->readFieldNumber(field_tag); + [[maybe_unused]] bool ret = reader->readFieldNumber(field_tag); assert(ret); serializer->readRow(row_num);