Updated Branches: refs/heads/master 5ba91f23b -> d9c80e2da
THRIFT-2322: wrong Go code generated for assignment of an optional set Patch: Jens Geyer Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4095d62c Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4095d62c Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4095d62c Branch: refs/heads/master Commit: 4095d62cd795e5e8b1d9b0be3e8a9a2efe882f3c Parents: 5ba91f2 Author: Jens Geyer <[email protected]> Authored: Sat Dec 21 20:12:13 2013 +0100 Committer: Jens Geyer <[email protected]> Committed: Sat Dec 21 20:14:43 2013 +0100 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_go_generator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/4095d62c/compiler/cpp/src/generate/t_go_generator.cc ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc index 21529da..ca50d1b 100644 --- a/compiler/cpp/src/generate/t_go_generator.cc +++ b/compiler/cpp/src/generate/t_go_generator.cc @@ -2606,7 +2606,7 @@ void t_go_generator::generate_deserialize_container(ofstream &out, indent() << " return fmt.Errorf(\"error reading set begin: %s\")" << endl << indent() << "}" << endl << indent() << "tSet := make(map[" << type_to_go_key_type(t->get_elem_type()) << "]bool, size)" << endl << - indent() << prefix << eq << "tSet" << endl; + indent() << prefix << eq << " " << (optional_field ? "&" : "") << "tSet" << endl; } else if (ttype->is_list()) { out << indent() << "_, size, err := iprot.ReadListBegin()" << endl <<
