From 45a595d24941e6e35466acb2fb4a15d4b9f2ce5a Mon Sep 17 00:00:00 2001 From: Arun Olappamanna Vasudevan Date: Mon, 13 Aug 2018 01:07:58 -0700 Subject: [PATCH] Add overrides in C++ code. --- src/google/protobuf/reflection_internal.h | 2 +- .../internal/default_value_objectwriter.h | 2 +- .../util/internal/json_objectwriter.h | 29 +++++++++---------- src/google/protobuf/util/json_util.cc | 16 +++++----- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/google/protobuf/reflection_internal.h b/src/google/protobuf/reflection_internal.h index ff62d58d89..b3cf659a7e 100644 --- a/src/google/protobuf/reflection_internal.h +++ b/src/google/protobuf/reflection_internal.h @@ -203,7 +203,7 @@ class MapFieldAccessor final : public RandomAccessRepeatedFieldAccessor { public: MapFieldAccessor() {} virtual ~MapFieldAccessor() {} - virtual bool IsEmpty(const Field* data) const { + bool IsEmpty(const Field* data) const override { return GetRepeatedField(data)->empty(); } int Size(const Field* data) const override { diff --git a/src/google/protobuf/util/internal/default_value_objectwriter.h b/src/google/protobuf/util/internal/default_value_objectwriter.h index 7a8863ca7e..89636dc527 100644 --- a/src/google/protobuf/util/internal/default_value_objectwriter.h +++ b/src/google/protobuf/util/internal/default_value_objectwriter.h @@ -119,7 +119,7 @@ class PROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter { DefaultValueObjectWriter* RenderBytes(StringPiece name, StringPiece value) override; - virtual DefaultValueObjectWriter* RenderNull(StringPiece name); + DefaultValueObjectWriter* RenderNull(StringPiece name) override; // Register the callback for scrubbing of fields. Owership of // field_scrub_callback pointer is also transferred to this class diff --git a/src/google/protobuf/util/internal/json_objectwriter.h b/src/google/protobuf/util/internal/json_objectwriter.h index ebfc7fbaa9..2e19c9b349 100644 --- a/src/google/protobuf/util/internal/json_objectwriter.h +++ b/src/google/protobuf/util/internal/json_objectwriter.h @@ -95,21 +95,20 @@ class PROTOBUF_EXPORT JsonObjectWriter : public StructuredObjectWriter { virtual ~JsonObjectWriter(); // ObjectWriter methods. - virtual JsonObjectWriter* StartObject(StringPiece name); - virtual JsonObjectWriter* EndObject(); - virtual JsonObjectWriter* StartList(StringPiece name); - virtual JsonObjectWriter* EndList(); - virtual JsonObjectWriter* RenderBool(StringPiece name, bool value); - virtual JsonObjectWriter* RenderInt32(StringPiece name, int32 value); - virtual JsonObjectWriter* RenderUint32(StringPiece name, uint32 value); - virtual JsonObjectWriter* RenderInt64(StringPiece name, int64 value); - virtual JsonObjectWriter* RenderUint64(StringPiece name, uint64 value); - virtual JsonObjectWriter* RenderDouble(StringPiece name, double value); - virtual JsonObjectWriter* RenderFloat(StringPiece name, float value); - virtual JsonObjectWriter* RenderString(StringPiece name, - StringPiece value); - virtual JsonObjectWriter* RenderBytes(StringPiece name, StringPiece value); - virtual JsonObjectWriter* RenderNull(StringPiece name); + JsonObjectWriter* StartObject(StringPiece name) override; + JsonObjectWriter* EndObject() override; + JsonObjectWriter* StartList(StringPiece name) override; + JsonObjectWriter* EndList() override; + JsonObjectWriter* RenderBool(StringPiece name, bool value) override; + JsonObjectWriter* RenderInt32(StringPiece name, int32 value) override; + JsonObjectWriter* RenderUint32(StringPiece name, uint32 value) override; + JsonObjectWriter* RenderInt64(StringPiece name, int64 value) override; + JsonObjectWriter* RenderUint64(StringPiece name, uint64 value) override; + JsonObjectWriter* RenderDouble(StringPiece name, double value) override; + JsonObjectWriter* RenderFloat(StringPiece name, float value) override; + JsonObjectWriter* RenderString(StringPiece name, StringPiece value) override; + JsonObjectWriter* RenderBytes(StringPiece name, StringPiece value) override; + JsonObjectWriter* RenderNull(StringPiece name) override; virtual JsonObjectWriter* RenderNullAsEmpty(StringPiece name); void set_use_websafe_base64_for_bytes(bool value) { diff --git a/src/google/protobuf/util/json_util.cc b/src/google/protobuf/util/json_util.cc index 0d2173c786..8c0b4eb96a 100644 --- a/src/google/protobuf/util/json_util.cc +++ b/src/google/protobuf/util/json_util.cc @@ -129,9 +129,9 @@ class StatusErrorListener : public converter::ErrorListener { util::Status GetStatus() { return status_; } - virtual void InvalidName(const converter::LocationTrackerInterface& loc, - StringPiece unknown_name, - StringPiece message) { + void InvalidName(const converter::LocationTrackerInterface& loc, + StringPiece unknown_name, + StringPiece message) override { string loc_string = GetLocString(loc); if (!loc_string.empty()) { loc_string.append(" "); @@ -141,17 +141,17 @@ class StatusErrorListener : public converter::ErrorListener { StrCat(loc_string, unknown_name, ": ", message)); } - virtual void InvalidValue(const converter::LocationTrackerInterface& loc, - StringPiece type_name, - StringPiece value) { + void InvalidValue(const converter::LocationTrackerInterface& loc, + StringPiece type_name, + StringPiece value) override { status_ = util::Status( util::error::INVALID_ARGUMENT, StrCat(GetLocString(loc), ": invalid value ", string(value), " for type ", string(type_name))); } - virtual void MissingField(const converter::LocationTrackerInterface& loc, - StringPiece missing_name) { + void MissingField(const converter::LocationTrackerInterface& loc, + StringPiece missing_name) override { status_ = util::Status(util::error::INVALID_ARGUMENT, StrCat(GetLocString(loc), ": missing field ", string(missing_name)));