THRIFT-5091 Netstd generator produces uncompileable code for struct names ending with "_result" or "_args"
Client: netstd
Patch: Jens Geyer
THis closes #2006
diff --git a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
index ba55960..cc6287d 100644
--- a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
@@ -2746,17 +2746,19 @@
return "List<" + type_name(tlist->get_elem_type()) + ">";
}
+ string the_name = check_and_correct_struct_name(normalize_name(ttype->get_name()));
+
t_program* program = ttype->get_program();
if (program != NULL && program != program_)
{
string ns = program->get_namespace("netstd");
if (!ns.empty())
{
- return ns + "." + normalize_name(ttype->get_name());
+ return ns + "." + the_name;
}
}
- return normalize_name(ttype->get_name());
+ return the_name;
}
string t_netstd_generator::base_type_name(t_base_type* tbase)