Repository: thrift Updated Branches: refs/heads/master 2bfd7df93 -> 867fafffa
THRIFT-3401 Nested collections emit Objective-C code that cannot compile Client: Cocoa Patch: Kevin Wooten <[email protected]> This closes #665 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/867fafff Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/867fafff Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/867fafff Branch: refs/heads/master Commit: 867fafffa5ccd80c9842ebc759951a78b402668a Parents: 2bfd7df Author: Kevin Wooten <[email protected]> Authored: Wed Oct 28 14:43:22 2015 -0700 Committer: Jens Geyer <[email protected]> Committed: Thu Oct 29 22:51:33 2015 +0200 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_cocoa_generator.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/867fafff/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 97946d7..61a24c0 100644 --- a/compiler/cpp/src/generate/t_cocoa_generator.cc +++ b/compiler/cpp/src/generate/t_cocoa_generator.cc @@ -2646,13 +2646,13 @@ string t_cocoa_generator::element_type_name(t_type* etype) { result = "NSNumber *"; } else if (ttype->is_map()) { t_map *map = (t_map *)ttype; - result = "NSDictionary<" + element_type_name(map->get_key_type()) + ", " + element_type_name(map->get_val_type()) + ">"; + result = "NSDictionary<" + element_type_name(map->get_key_type()) + ", " + element_type_name(map->get_val_type()) + "> *"; } else if (ttype->is_set()) { t_set *set = (t_set *)ttype; - result = "NSSet<" + element_type_name(set->get_elem_type()) + ">"; + result = "NSSet<" + element_type_name(set->get_elem_type()) + "> *"; } else if (ttype->is_list()) { t_list *list = (t_list *)ttype; - result = "NSArray<" + element_type_name(list->get_elem_type()) + ">"; + result = "NSArray<" + element_type_name(list->get_elem_type()) + "> *"; } else if (ttype->is_struct() || ttype->is_xception()) { result = cocoa_prefix_ + ttype->get_name() + " *"; }
