diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-16 08:38:24 -0800 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-16 08:38:24 -0800 |
| commit | 991500dfe6050cf322b70c4a5c535d630065abb2 (patch) | |
| tree | 31287a3c22c7f17c32b1c76da4a9c83940388fa4 /cpp/src/Slice/Grammar.cpp | |
| parent | Fixed ICE-5143 and ICE-5140: stringified proxy and default raw encoding for o... (diff) | |
| download | ice-991500dfe6050cf322b70c4a5c535d630065abb2.tar.bz2 ice-991500dfe6050cf322b70c4a5c535d630065abb2.tar.xz ice-991500dfe6050cf322b70c4a5c535d630065abb2.zip | |
Fixed Slice parser bug where compact Ids redefinition weren't ignore even if Unit parsing was requested to ignore redefinitions
Diffstat (limited to 'cpp/src/Slice/Grammar.cpp')
| -rw-r--r-- | cpp/src/Slice/Grammar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp index 976f099f0d6..0df11f89b2f 100644 --- a/cpp/src/Slice/Grammar.cpp +++ b/cpp/src/Slice/Grammar.cpp @@ -2508,7 +2508,7 @@ yyreduce: else { string typeId = unit->getTypeId(static_cast<int>(id)); - if(!typeId.empty()) + if(!typeId.empty() && !unit->ignRedefs()) { unit->error("invalid compact id for class: already assigned to class `" + typeId + "'"); } |