diff options
| author | Chih-hung Hsieh <chh@google.com> | 2018-08-03 12:21:47 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-03 12:21:47 -0700 |
| commit | e9ab58d7c0a173e058cfd3e15f1a72a4c0c8be93 (patch) | |
| tree | 5b409ebd4bd2fec7fd211618f0cf43dad17fc5e8 | |
| parent | 266c9bb486ee64a6e894459ba62128c60b27ce94 (diff) | |
| parent | a03b9a5de3902a5b9c4e9c185998ebff1a41cbdf (diff) | |
| download | platform_external_protobuf-master-cuttlefish-testing-release.tar.gz platform_external_protobuf-master-cuttlefish-testing-release.tar.bz2 platform_external_protobuf-master-cuttlefish-testing-release.zip | |
Merge "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3master-cuttlefish-testing-release
am: a03b9a5de3
Change-Id: I97df2a0ff28f386b76d8a793753a026de565595b
| -rw-r--r-- | README.android | 1 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_message.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/README.android b/README.android index f1e97d9d3..0f7d5e1b3 100644 --- a/README.android +++ b/README.android @@ -9,6 +9,7 @@ Local Modifications: - Initial changes include support for the micro protobuf compiler and the assoicated runtime. - https://github.com/google/protobuf/pull/2732: const FieldDescriptorCompare + - Add NOLINT to "return *default_instance_;" in cpp_message.cc. Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc index 14a9a99f4..130e5b2e8 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.cc +++ b/src/google/protobuf/compiler/cpp/cpp_message.cc @@ -2313,7 +2313,7 @@ GenerateStructors(io::Printer* printer) { GlobalAddDescriptorsName(descriptor_->file()->name())); printer->Print( - " return *default_instance_;\n" + " return *default_instance_; /* NOLINT */\n" "}\n" "\n" "$classname$* $classname$::default_instance_ = NULL;\n" |