aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2016-03-14 10:07:05 -0400
committerGravatar Thomas Van Lenten <thomasvl@google.com>2016-03-14 10:07:05 -0400
commit44fdead9d2652f958cb6e7e29a6d871ef132bb4c (patch)
treee12b5dfe103529948217d1cbe99e986bab55761a /src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
parent9aea0ef0cd836fb998d2eb27bd84897f3c9a14f6 (diff)
parentb5a35b441107c40e53584cf655dd558a05f40e79 (diff)
Merge pull request #1291 from sergiocampama/devel
Adds more information to Objective C error.
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_helpers.cc')
-rw-r--r--src/google/protobuf/compiler/objectivec/objectivec_helpers.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
index 613a511c..b912ea67 100644
--- 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";
}