aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/compiler
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-07-28 07:36:45 -0700
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-07-28 07:36:45 -0700
commit753b3cbb5bd6302d2f8569cb89bfc99a965985cb (patch)
tree64b045042c35db98dde57b5ff4b587516ab585d8 /src/compiler
parentdfc42da76011eec3270b3dbcc94748916e0aa5b2 (diff)
parent26d533ebb8579b1e1da3710631a890ebe38ab58c (diff)
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/python_generator.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/python_generator.cc b/src/compiler/python_generator.cc
index 724b69c703..2982a89fad 100644
--- a/src/compiler/python_generator.cc
+++ b/src/compiler/python_generator.cc
@@ -249,7 +249,7 @@ bool GetModuleAndMessagePath(const Descriptor* type,
do {
message_path.push_back(path_elem_type);
path_elem_type = path_elem_type->containing_type();
- } while (path_elem_type != nullptr);
+ } while (path_elem_type); // implicit nullptr comparison; don't be explicit
grpc::string file_name = type->file()->name();
static const int proto_suffix_length = strlen(".proto");
if (!(file_name.size() > static_cast<size_t>(proto_suffix_length) &&