diff options
author | murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
commit | 4d736a024ca45738412f7cf73994393b7f162811 (patch) | |
tree | e2b5085817619e9aba3e4f88407f344b36e911af /src/compiler/python_plugin.cc | |
parent | 2822e9ad7598a68597e49e8f1875486aa12bf267 (diff) | |
parent | 8b131922438d96579cb315777ca980e094883496 (diff) |
Resolved merge conflicts
Diffstat (limited to 'src/compiler/python_plugin.cc')
-rw-r--r-- | src/compiler/python_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/python_plugin.cc b/src/compiler/python_plugin.cc index ebe3660619..05c6b095d8 100644 --- a/src/compiler/python_plugin.cc +++ b/src/compiler/python_plugin.cc @@ -63,7 +63,7 @@ class PythonGrpcGenerator : public CodeGenerator { // Get output file name. string file_name; static const int proto_suffix_length = 6; // length of ".proto" - if (file->name().size() > proto_suffix_length && + if (file->name().size() > static_cast<size_t>(proto_suffix_length) && file->name().find_last_of(".proto") == file->name().size() - 1) { file_name = file->name().substr( 0, file->name().size() - proto_suffix_length) + "_pb2.py"; |