diff options
| author | stone4774 <25053818+stone4774@users.noreply.github.com> | 2018-03-22 11:16:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 11:16:34 +0800 |
| commit | c99f5278eb8dad6f42def88ce8b5a3453f6df4a8 (patch) | |
| tree | c3cd284ec9d2981f61da266d040935b73275b5c4 /src/google/protobuf/compiler/cpp/cpp_padding_optimizer.h | |
| parent | d053271deebe0efcd41729991b1f3d618b638ad5 (diff) | |
| parent | ed4321d1cb33199984118d801956822842771e7e (diff) | |
| download | protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.tar.gz protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.tar.bz2 protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.zip | |
Merge branch 'master' into fixbug_enum2json2
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_padding_optimizer.h')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_padding_optimizer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_padding_optimizer.h b/src/google/protobuf/compiler/cpp/cpp_padding_optimizer.h index 9641ba40..42a3b5cd 100644 --- a/src/google/protobuf/compiler/cpp/cpp_padding_optimizer.h +++ b/src/google/protobuf/compiler/cpp/cpp_padding_optimizer.h @@ -50,10 +50,10 @@ namespace cpp { class PaddingOptimizer : public MessageLayoutHelper { public: PaddingOptimizer() {} - ~PaddingOptimizer() {} + ~PaddingOptimizer() override {} void OptimizeLayout(std::vector<const FieldDescriptor*>* fields, - const Options& options); + const Options& options) override; }; } // namespace cpp |