diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-07-23 09:28:29 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-07-23 09:28:29 -0230 |
| commit | f53f77e7c929f2f0a64448e49758638e41f83d2f (patch) | |
| tree | cb7afd87a04f68e2cb035aa9969c4f158f7b6931 /cpp/src/Slice/Parser.cpp | |
| parent | Merge 'origin/3.6' (diff) | |
| download | ice-f53f77e7c929f2f0a64448e49758638e41f83d2f.tar.bz2 ice-f53f77e7c929f2f0a64448e49758638e41f83d2f.tar.xz ice-f53f77e7c929f2f0a64448e49758638e41f83d2f.zip | |
ICE-6645 Removed hack to keep binary compatibility in Ice 3.6.1
Diffstat (limited to 'cpp/src/Slice/Parser.cpp')
| -rw-r--r-- | cpp/src/Slice/Parser.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index fdfbffba453..8a138ebf4a0 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -1178,16 +1178,8 @@ Slice::Container::lookupType(const string& scoped, bool printError) return lookupTypeNoBuiltin(scoped, printError); } -// -// TODO: Hack to keep binary compatibility with Ice 3.6.0, fix properly in Ice 3.7 -// -namespace -{ -bool ignoreUndefined = false; -} - TypeList -Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError) +Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError, bool ignoreUndefined) { // // Remove whitespace. @@ -1304,12 +1296,7 @@ Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError) ContainedPtr contained = ContainedPtr::dynamicCast(this); if(contained) { - if (typeError) - { - ignoreUndefined = true; - } - results = contained->container()->lookupTypeNoBuiltin(sc, printError); - ignoreUndefined = false; + results = contained->container()->lookupTypeNoBuiltin(sc, printError, typeError || ignoreUndefined); } else if(!typeError) { |