From 6f88e12f9dee4a658913b475e7680952c6ff3cac Mon Sep 17 00:00:00 2001 From: Khuzema Pithewan Date: Mon, 21 May 2018 15:16:34 -0700 Subject: Add "override" for overridden virtual functions Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67 --- src/google/protobuf/util/message_differencer.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/google/protobuf/util/message_differencer.h') diff --git a/src/google/protobuf/util/message_differencer.h b/src/google/protobuf/util/message_differencer.h index bbcf8498..b3e65515 100644 --- a/src/google/protobuf/util/message_differencer.h +++ b/src/google/protobuf/util/message_differencer.h @@ -597,7 +597,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer { public: explicit StreamReporter(io::ZeroCopyOutputStream* output); explicit StreamReporter(io::Printer* printer); // delimiter '$' - virtual ~StreamReporter(); + virtual ~StreamReporter() override; // When set to true, the stream reporter will also output aggregates nodes // (i.e. messages and groups) whose subfields have been modified. When @@ -607,32 +607,33 @@ class LIBPROTOBUF_EXPORT MessageDifferencer { } // The following are implementations of the methods described above. + virtual void ReportAdded(const Message& message1, const Message& message2, - const std::vector& field_path); + const std::vector& field_path) override; virtual void ReportDeleted(const Message& message1, const Message& message2, - const std::vector& field_path); + const std::vector& field_path) override; virtual void ReportModified(const Message& message1, const Message& message2, - const std::vector& field_path); + const std::vector& field_path) override; virtual void ReportMoved(const Message& message1, const Message& message2, - const std::vector& field_path); + const std::vector& field_path) override; virtual void ReportMatched(const Message& message1, const Message& message2, - const std::vector& field_path); + const std::vector& field_path) override; virtual void ReportIgnored(const Message& message1, const Message& message2, - const std::vector& field_path); + const std::vector& field_path) override; - virtual void ReportUnknownFieldIgnored( + void ReportUnknownFieldIgnored( const Message& message1, const Message& message2, - const std::vector& field_path); + const std::vector& field_path) override; protected: // Prints the specified path of fields to the buffer. message is used to @@ -681,7 +682,7 @@ class LIBPROTOBUF_EXPORT MessageDifferencer { public: explicit MapEntryKeyComparator(MessageDifferencer* message_differencer); virtual bool IsMatch(const Message& message1, const Message& message2, - const std::vector& parent_fields) const; + const std::vector& parent_fields) const override; private: MessageDifferencer* message_differencer_; -- cgit v1.2.3