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/util/type_resolver_util.cc | |
| 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/util/type_resolver_util.cc')
| -rw-r--r-- | src/google/protobuf/util/type_resolver_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/util/type_resolver_util.cc b/src/google/protobuf/util/type_resolver_util.cc index a69ed58c..aa48ef60 100644 --- a/src/google/protobuf/util/type_resolver_util.cc +++ b/src/google/protobuf/util/type_resolver_util.cc @@ -60,7 +60,7 @@ class DescriptorPoolTypeResolver : public TypeResolver { const DescriptorPool* pool) : url_prefix_(url_prefix), pool_(pool) {} - Status ResolveMessageType(const string& type_url, Type* type) { + Status ResolveMessageType(const string& type_url, Type* type) override { string type_name; Status status = ParseTypeUrl(type_url, &type_name); if (!status.ok()) { @@ -75,7 +75,7 @@ class DescriptorPoolTypeResolver : public TypeResolver { return Status(); } - Status ResolveEnumType(const string& type_url, Enum* enum_type) { + Status ResolveEnumType(const string& type_url, Enum* enum_type) override { string type_name; Status status = ParseTypeUrl(type_url, &type_name); if (!status.ok()) { |