diff options
| author | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
| commit | b9c2a6f6628476f11c78a7de2adc90edca1e209e (patch) | |
| tree | df192d87dfbc594a7a2b52a96b5145ad3156d26f /cpp/src/Slice/Parser.cpp | |
| parent | ICE-6645 Removed hack to keep binary compatibility in Ice 3.6.1 (diff) | |
| parent | Removed ARM configuraton from WinRT testsuite solutions (diff) | |
| download | ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.bz2 ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.xz ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/Slice/Parser.cpp')
| -rw-r--r-- | cpp/src/Slice/Parser.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 8a138ebf4a0..07df9c2f75e 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -1309,23 +1309,19 @@ Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError, boo } return TypeList(); } - if(typeError && results.empty() && printError) - { - for(vector<string>::const_iterator p = errors.begin(); p != errors.end(); ++p) - { - _unit->error(*p); - } - } - return results; } - else + + // + // Do not emit errors if there was a type error but a match was found in a higher scope. + // + if(printError && !(typeError && !results.empty())) { for(vector<string>::const_iterator p = errors.begin(); p != errors.end(); ++p) { _unit->error(*p); } - return results; } + return results; } ContainedList |