You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2014/01/08 04:31:46 UTC

git commit: THRIFT-2211:Exception constructor does not contain namespace prefix Client: cocoa Patch: Jan Brauer

Updated Branches:
  refs/heads/master 5d02b80e9 -> 06dbb8f01


THRIFT-2211:Exception constructor does not contain namespace prefix
Client: cocoa
Patch: Jan Brauer

Prefixed cocoa exceptions with set namespace.


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/06dbb8f0
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/06dbb8f0
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/06dbb8f0

Branch: refs/heads/master
Commit: 06dbb8f011d2deccb66266ca45f8ea1a2f84ffb1
Parents: 5d02b80
Author: Jake Farrell <jf...@apache.org>
Authored: Tue Jan 7 22:29:50 2014 -0500
Committer: Jake Farrell <jf...@apache.org>
Committed: Tue Jan 7 22:29:50 2014 -0500

----------------------------------------------------------------------
 compiler/cpp/src/generate/t_cocoa_generator.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/06dbb8f0/compiler/cpp/src/generate/t_cocoa_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_cocoa_generator.cc b/compiler/cpp/src/generate/t_cocoa_generator.cc
index b917a14..e498032 100644
--- a/compiler/cpp/src/generate/t_cocoa_generator.cc
+++ b/compiler/cpp/src/generate/t_cocoa_generator.cc
@@ -733,7 +733,7 @@ void t_cocoa_generator::generate_cocoa_struct_implementation(ofstream &out,
   if (is_exception) {
     out << indent() << "- (id) init" << endl;
     scope_up(out);
-    out << indent() << "return [super initWithName: @\"" << tstruct->get_name() <<
+    out << indent() << "return [super initWithName: @\"" << cocoa_prefix_ << tstruct->get_name() <<
         "\" reason: @\"unknown\" userInfo: nil];" << endl;
     scope_down(out);
     out << endl;
@@ -1175,7 +1175,7 @@ void t_cocoa_generator::generate_cocoa_struct_description(ofstream& out,
 
   out <<
     indent() << "NSMutableString * ms = [NSMutableString stringWithString: @\"" <<
-    tstruct->get_name() << "(\"];" << endl;
+    cocoa_prefix_ << tstruct->get_name() << "(\"];" << endl;
 
   const vector<t_field*>& fields = tstruct->get_members();
   vector<t_field*>::const_iterator f_iter;