AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #540 from pherl/clean-warnings

Browse Source 
fix compiler warnings.
This commit is contained in:
Jisi Liu 2015-06-25 01:37:43 -07:00
commit d40a0db202
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/google/protobuf/util/field_comparator.cc
View File

@ -106,6 +106,7 @@ FieldComparator::ComparisonResult DefaultFieldComparator::Compare(
default: default:
GOOGLE_LOG(FATAL) << "No comparison code for field " << field->full_name() GOOGLE_LOG(FATAL) << "No comparison code for field " << field->full_name()
<< " of CppType = " << field->cpp_type(); << " of CppType = " << field->cpp_type();
return DIFFERENT;
} }
} }

3
src/google/protobuf/util/internal/type_info_test_helper.cc
View File

@ -97,6 +97,7 @@ ProtoStreamObjectSource* TypeInfoTestHelper::NewProtoSource(
} }
} }
GOOGLE_LOG(FATAL) << "Can not reach here."; GOOGLE_LOG(FATAL) << "Can not reach here.";
return NULL;
} }
ProtoStreamObjectWriter* TypeInfoTestHelper::NewProtoWriter( ProtoStreamObjectWriter* TypeInfoTestHelper::NewProtoWriter(
@ -110,6 +111,7 @@ ProtoStreamObjectWriter* TypeInfoTestHelper::NewProtoWriter(
} }
} }
GOOGLE_LOG(FATAL) << "Can not reach here."; GOOGLE_LOG(FATAL) << "Can not reach here.";
return NULL;
} }
DefaultValueObjectWriter* TypeInfoTestHelper::NewDefaultValueWriter( DefaultValueObjectWriter* TypeInfoTestHelper::NewDefaultValueWriter(
@ -121,6 +123,7 @@ DefaultValueObjectWriter* TypeInfoTestHelper::NewDefaultValueWriter(
} }
} }
GOOGLE_LOG(FATAL) << "Can not reach here."; GOOGLE_LOG(FATAL) << "Can not reach here.";
return NULL;
} }
} // namespace testing } // namespace testing

13
src/google/protobuf/util/message_differencer.h
View File

@ -289,20 +289,11 @@ class LIBPROTOBUF_EXPORT MessageDifferencer {
MapKeyComparator(); MapKeyComparator();
virtual ~MapKeyComparator(); virtual ~MapKeyComparator();
// The first IsMatch without parent_fields is only for backward
// compatibility. New users should override the second one instead.
//
// Deprecated.
// TODO(ykzhu): remove this function.
virtual bool IsMatch(const Message& message1,
const Message& message2) const {
GOOGLE_CHECK(false) << "This function shouldn't get called";
return false;
}
virtual bool IsMatch(const Message& message1, virtual bool IsMatch(const Message& message1,
const Message& message2, const Message& message2,
const vector<SpecificField>& parent_fields) const { const vector<SpecificField>& parent_fields) const {
return IsMatch(message1, message2); GOOGLE_CHECK(false) << "IsMatch() is not implemented.";
return false;
} }
private: private: