diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2018-06-25 13:52:55 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-25 13:52:55 -0700 |
| commit | 0b0890b36d01bf7b372cb237998ee793f5cdc433 (patch) | |
| tree | 20f4e0b1ad1f74f794f2cb45110841f2b26af23b /src/google/protobuf/dynamic_message.h | |
| parent | d9ccd0c0e6bbda9bf4476088eeb46b02d7dcd327 (diff) | |
| parent | 6f88e12f9dee4a658913b475e7680952c6ff3cac (diff) | |
Merge pull request #4608 from khuzemap/master
Add "override" keyword for overridden virtual functions
Diffstat (limited to 'src/google/protobuf/dynamic_message.h')
| -rw-r--r-- | src/google/protobuf/dynamic_message.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/dynamic_message.h b/src/google/protobuf/dynamic_message.h index d84cc8af..940d5e15 100644 --- a/src/google/protobuf/dynamic_message.h +++ b/src/google/protobuf/dynamic_message.h @@ -115,7 +115,7 @@ class LIBPROTOBUF_EXPORT DynamicMessageFactory : public MessageFactory { // outlive the DynamicMessageFactory. // // The method is thread-safe. - const Message* GetPrototype(const Descriptor* type); + const Message* GetPrototype(const Descriptor* type) override; private: const DescriptorPool* pool_; |