From 04650afb872fbf62dc31426d7278261bf178fc4f Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Fri, 10 Sep 2010 18:49:53 +0000 Subject: [PATCH] THRIFT-544. erl: multiple enums with the same key generate invalid code This adds the enum name to the generated constants to avoid collisions. Patch: Ben Taitelbaum git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@995924 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_erl_generator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/cpp/src/generate/t_erl_generator.cc b/compiler/cpp/src/generate/t_erl_generator.cc index a5b6b9cd..2ed03159 100644 --- a/compiler/cpp/src/generate/t_erl_generator.cc +++ b/compiler/cpp/src/generate/t_erl_generator.cc @@ -298,7 +298,7 @@ void t_erl_generator::generate_enum(t_enum* tenum) { string name = capitalize((*c_iter)->get_name()); f_types_hrl_file_ << - indent() << "-define(" << program_name_ << "_" << name << ", " << value << ")."<< endl; + indent() << "-define(" << program_name_ << "_" << tenum->get_name() << "_" << name << ", " << value << ")."<< endl; } f_types_hrl_file_ << endl; -- 2.17.1