valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 18:58:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix enum value lookups in C++

Browse Source 
The recent enum change was causing enums to break if used as constant
values by the C++ generator.  The problem was that we were searching for
the fully-qualified constant name (enum_name.VALUE_NAME) in the enum
values.  This didn't affect Java because it just uses symbolic names in
the generated code.  Fix it by grabbing the base name before doing the
search.

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@996610 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Reiss 2010-09-13 17:32:14 +00:00
parent 8d7667c27f
commit bdd6261b33
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/cpp/src/parse/t_const_value.h
View File

@ -71,10 +71,15 @@ class t_const_value {
if (enum_ == NULL) {
throw "have identifier \"" + get_identifier() + "\", but unset enum on line!";
}
t_enum_value* val = enum_->get_constant_by_name(get_identifier());
std::string identifier = get_identifier();
std::string::size_type dot = identifier.rfind('.');
if (dot != std::string::npos) {
identifier = identifier.substr(dot+1);
}
t_enum_value* val = enum_->get_constant_by_name(identifier);
if (val == NULL) {
throw
"Unable to find enum value \"" + get_identifier() +
"Unable to find enum value \"" + identifier +
"\" in enum \"" + enum_->get_name() + "\"";
}
return val->get_value();