aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/compiler/java
diff options
context:
space:
mode:
authorRoss Wang <rosswang@google.com>2017-02-17 15:48:08 -0800
committerGitHub <noreply@github.com>2017-02-17 15:48:08 -0800
commit01a05a53f40ca2ac5f0af10c6cc0810bee39b792 (patch)
tree0b89fedfc642bddd91ca00c3895d1a7b9abff9af /src/google/protobuf/compiler/java
parenta9ab38c17178fcedd9b46c09fa33f94d1a6335c3 (diff)
downloadprotobuf-01a05a53f40ca2ac5f0af10c6cc0810bee39b792.tar.gz
protobuf-01a05a53f40ca2ac5f0af10c6cc0810bee39b792.tar.bz2
protobuf-01a05a53f40ca2ac5f0af10c6cc0810bee39b792.zip
const FieldDescriptorCompare
Clang now validates that <set> comparators must have a const operator(): https://reviews.llvm.org/rL291969 Discussion: https://groups.google.com/d/msg/protobuf/9W6zFIHaJ-4/9RrfwelpEQAJ
Diffstat (limited to 'src/google/protobuf/compiler/java')
-rw-r--r--src/google/protobuf/compiler/java/java_file.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc
index cb4503f6..86719f70 100644
--- 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;
}