svn commit: r995924 - /incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc

[br...@apache.org]

Author: bryanduxbury
Date: Fri Sep 10 18:49:53 2010
New Revision: 995924

URL: http://svn.apache.org/viewvc?rev=995924&view=rev
Log:
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

Modified:
    incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc

Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc?rev=995924&r1=995923&r2=995924&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc Fri Sep 10 18:49:53 2010
@@ -298,7 +298,7 @@ void t_erl_generator::generate_enum(t_en
     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;