diff options
author | Mark Spruiell <mes@zeroc.com> | 2012-10-17 12:38:03 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2012-10-17 12:38:03 -0700 |
commit | f087326373250c76fa3b7b8e68cede0cb9af01ff (patch) | |
tree | e801ec18aba93a74b373388fc947617643da0008 /cpp/src/slice2php/Main.cpp | |
parent | Fix related to ICE-4847 (diff) | |
download | ice-f087326373250c76fa3b7b8e68cede0cb9af01ff.tar.bz2 ice-f087326373250c76fa3b7b8e68cede0cb9af01ff.tar.xz ice-f087326373250c76fa3b7b8e68cede0cb9af01ff.zip |
ICE-4619 - custom enumerator values
Diffstat (limited to 'cpp/src/slice2php/Main.cpp')
-rw-r--r-- | cpp/src/slice2php/Main.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index dc2453fb77c..2209bee48b4 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -926,10 +926,7 @@ CodeVisitor::visitEnum(const EnumPtr& p) long i = 0; for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q, ++i) { - string fixedEnum = fixIdent((*q)->name()); - ostringstream idx; - idx << i; - _out << nl << "const " << fixedEnum << " = " << idx.str() << ';'; + _out << nl << "const " << fixIdent((*q)->name()) << " = " << (*q)->value() << ';'; } } @@ -945,7 +942,7 @@ CodeVisitor::visitEnum(const EnumPtr& p) { _out << ", "; } - _out << "'" << (*q)->name() << "'"; + _out << "'" << (*q)->name() << "', " << (*q)->value(); } _out << "));"; |