Merge pull request #1291 from sergiocampama/devel

Adds more information to Objective C error.
9 years ago · 44fdead9d2
parent 9aea0ef0cd b5a35b4411
commit 44fdead9d2
1 changed files with 2 additions and 1 deletions
--- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
@ -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";
      }