Merge pull request #2732 from AsturaPhoenix/master

const FieldDescriptorCompare
8 years ago · 8387b88cdc
parent 66c64e7045 01a05a53f4
commit 8387b88cdc
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/compiler/java/java_file.cc
+++ b/src/google/protobuf/compiler/java/java_file.cc
@ -65,7 +65,7 @@ namespace java {
 namespace {

 struct FieldDescriptorCompare {
-  bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) {
+  bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) const {
    if(f1 == NULL) {
      return false;
    }