diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 08:06:16 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 08:06:16 +0000 |
| commit | 9680d5de776e636ea26b4722aab8e4d405ce124e (patch) | |
| tree | 1c249b7713c7b3268514b4364b03e5cdd446edb3 /third_party | |
| parent | de874b474abb19016f89231f5cd8ef009004659e (diff) | |
| download | chromium_src-9680d5de776e636ea26b4722aab8e4d405ce124e.zip chromium_src-9680d5de776e636ea26b4722aab8e4d405ce124e.tar.gz chromium_src-9680d5de776e636ea26b4722aab8e4d405ce124e.tar.bz2 | |
Remove comparison of address with NULL.
Addresses are always non-NULL per spec. This merges a change that has already
been applied to the google-internal version of protobuf.
BUG=381910
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/379973003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/protobuf/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/protobuf/src/google/protobuf/descriptor.cc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium index 298c207..de78392 100644 --- a/third_party/protobuf/README.chromium +++ b/third_party/protobuf/README.chromium @@ -33,6 +33,7 @@ Revision 517 was cherry-picked from upstream. Revision 522 was cherry-picked from upstream. Revision 523 was cherry-picked from upstream. Revision 524 was cherry-picked from upstream. +The `&file->options() != NULL &&` was removed from descriptor.cc Notes about Java: We have not forked the Java version of protobuf-lite, so the Java version does diff --git a/third_party/protobuf/src/google/protobuf/descriptor.cc b/third_party/protobuf/src/google/protobuf/descriptor.cc index c2bc81a..7c121d9 100644 --- a/third_party/protobuf/src/google/protobuf/descriptor.cc +++ b/third_party/protobuf/src/google/protobuf/descriptor.cc @@ -4021,7 +4021,6 @@ static bool IsLite(const FileDescriptor* file) { // TODO(kenton): I don't even remember how many of these conditions are // actually possible. I'm just being super-safe. return file != NULL && - &file->options() != NULL && &file->options() != &FileOptions::default_instance() && file->options().optimize_for() == FileOptions::LITE_RUNTIME; } |