Merge pull request #1291 from sergiocampama/devel

Adds more information to Objective C error.
This commit is contained in:
Thomas Van Lenten 2016-03-14 10:07:05 -04:00
commit 44fdead9d2

View File

@ -969,7 +969,8 @@ bool ValidateObjCClassPrefix(const FileDescriptor* file,
} else {
// ...it didn't match!
*out_error = "error: Expected 'option objc_class_prefix = \"" +
package_match->second + "\";' in '" + file->name() + "'";
package_match->second + "\";' for package '" + package +
"' in '" + file->name() + "'";
if (prefix.length()) {
*out_error += "; but found '" + prefix + "' instead";
}