This commit is contained in:
Kevin Darby committed 2019-01-02 16:52:09 -05:00
1 parent a28e541be0
commit e2dd18b3fa
421 files changed
+23599 -30913

No files matched your search

@@ -69,14 +69,14 @@ bool IsConflicting(const FieldDescriptor* field1, const string& name1,
// field1 is repeated, and field2 is not.
if (name1 + "Count" == name2) {
*info = "both repeated field \"" + field1->name() + "\" and singular " +
"field \"" + field2->name() + "\" generates the method \"" +
"get" + name1 + "Count()\"";
"field \"" + field2->name() + "\" generate the method \"" +
"get" + name1 + "Count()\"";
return true;
}
if (name1 + "List" == name2) {
*info = "both repeated field \"" + field1->name() + "\" and singular " +
"field \"" + field2->name() + "\" generates the method \"" +
"get" + name1 + "List()\"";
"field \"" + field2->name() + "\" generate the method \"" +
"get" + name1 + "List()\"";
return true;
}
// Well, there are obviously many more conflicting cases, but it probably