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/internal/type_info.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/internal/type_info.cc')
| -rw-r--r-- | src/google/protobuf/util/internal/type_info.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/google/protobuf/util/internal/type_info.cc b/src/google/protobuf/util/internal/type_info.cc index 3847b179..e32e71d0 100644 --- a/src/google/protobuf/util/internal/type_info.cc +++ b/src/google/protobuf/util/internal/type_info.cc @@ -59,7 +59,7 @@ class TypeInfoForTypeResolver : public TypeInfo { } virtual util::StatusOr<const google::protobuf::Type*> ResolveTypeUrl( - StringPiece type_url) const { + StringPiece type_url) const override { std::map<StringPiece, StatusOrType>::iterator it = cached_types_.find(type_url); if (it != cached_types_.end()) { @@ -79,13 +79,13 @@ class TypeInfoForTypeResolver : public TypeInfo { } virtual const google::protobuf::Type* GetTypeByTypeUrl( - StringPiece type_url) const { + StringPiece type_url) const override { StatusOrType result = ResolveTypeUrl(type_url); return result.ok() ? result.ValueOrDie() : NULL; } virtual const google::protobuf::Enum* GetEnumByTypeUrl( - StringPiece type_url) const { + StringPiece type_url) const override { std::map<StringPiece, StatusOrEnum>::iterator it = cached_enums_.find(type_url); if (it != cached_enums_.end()) { @@ -105,8 +105,10 @@ class TypeInfoForTypeResolver : public TypeInfo { return result.ok() ? result.ValueOrDie() : NULL; } + virtual const google::protobuf::Field* FindField( - const google::protobuf::Type* type, StringPiece camel_case_name) const { + const google::protobuf::Type* type, + StringPiece camel_case_name) const override { std::map<const google::protobuf::Type*, CamelCaseNameTable>::const_iterator it = indexed_types_.find(type); const CamelCaseNameTable& camel_case_name_table = |