You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2014/07/12 12:37:28 UTC
git commit: THRIFT-1609 Cocoa import namespace Client: Cocoa Patch:
Xabier Eizmendi
Repository: thrift
Updated Branches:
refs/heads/master 30a472e04 -> cdab7eef7
THRIFT-1609 Cocoa import namespace
Client: Cocoa
Patch: Xabier Eizmendi
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/cdab7eef
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/cdab7eef
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/cdab7eef
Branch: refs/heads/master
Commit: cdab7eef751ab26204d644da457f98ce77ad109f
Parents: 30a472e
Author: Jens Geyer <je...@apache.org>
Authored: Sat Jul 12 12:31:32 2014 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Sat Jul 12 12:36:41 2014 +0200
----------------------------------------------------------------------
compiler/cpp/src/generate/t_cocoa_generator.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/cdab7eef/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 558d82e..8f30ae9 100644
--- a/compiler/cpp/src/generate/t_cocoa_generator.cc
+++ b/compiler/cpp/src/generate/t_cocoa_generator.cc
@@ -2211,7 +2211,8 @@ void t_cocoa_generator::generate_serialize_list_element(ofstream& out,
*/
string t_cocoa_generator::type_name(t_type* ttype, bool class_ref) {
if (ttype->is_typedef()) {
- return cocoa_prefix_ + ttype->get_name();
+ t_program* program = ttype->get_program();
+ return program ? (program->get_namespace("cocoa") + ttype->get_name()) : ttype->get_name();
}
string result;