aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/field_comparator.cc
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2015-06-24 14:30:33 -0700
committerJisi Liu <jisi.liu@gmail.com>2015-06-24 14:56:58 -0700
commit658e72d8fb7599d566e843070ec90f8d0c9141c5 (patch)
tree8d93c5118b505de18393495e8e66ddd677af3ff4 /src/google/protobuf/util/field_comparator.cc
parent242fdef65a3eb681ce686c0a68c7d33d4fb2ea1a (diff)
downloadprotobuf-658e72d8fb7599d566e843070ec90f8d0c9141c5.tar.gz
protobuf-658e72d8fb7599d566e843070ec90f8d0c9141c5.tar.bz2
protobuf-658e72d8fb7599d566e843070ec90f8d0c9141c5.zip
fix compiler warnings.
- control reaches end of non-void function. - remove a deprecated IsMatch. Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
Diffstat (limited to 'src/google/protobuf/util/field_comparator.cc')
-rw-r--r--src/google/protobuf/util/field_comparator.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/util/field_comparator.cc b/src/google/protobuf/util/field_comparator.cc
index b7676a88..9f613265 100644
--- a/src/google/protobuf/util/field_comparator.cc
+++ b/src/google/protobuf/util/field_comparator.cc
@@ -106,6 +106,7 @@ FieldComparator::ComparisonResult DefaultFieldComparator::Compare(
default:
GOOGLE_LOG(FATAL) << "No comparison code for field " << field->full_name()
<< " of CppType = " << field->cpp_type();
+ return DIFFERENT;
}
}