diff options
| author | Michi Henning <michi@zeroc.com> | 2003-07-10 07:52:28 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-07-10 07:52:28 +0000 |
| commit | 1a429746456f4e4465f0bc47261798453dc8f8bf (patch) | |
| tree | 89d9ba35a1758829d4ee8ea1fe88852fefa2ca24 /cpp/src/Slice/Parser.cpp | |
| parent | Removed evictor from project file. (diff) | |
| download | ice-1a429746456f4e4465f0bc47261798453dc8f8bf.tar.bz2 ice-1a429746456f4e4465f0bc47261798453dc8f8bf.tar.xz ice-1a429746456f4e4465f0bc47261798453dc8f8bf.zip | |
Fixed incorrect include level update for interface and class definitions.
Diffstat (limited to 'cpp/src/Slice/Parser.cpp')
| -rw-r--r-- | cpp/src/Slice/Parser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 2eee9ccddf1..312d8ff62c8 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -382,17 +382,17 @@ Slice::Container::createClassDef(const string& name, bool intf, const ClassList& } else { + if(_unit->ignRedefs()) + { + def->updateIncludeLevel(); + return def; + } + string msg = "redefinition of "; msg += intf ? "interface" : "class"; msg += " `" + name + "'"; _unit->error(msg); } - - if(_unit->ignRedefs()) - { - def->updateIncludeLevel(); - return def; - } } else if(!_unit->caseSensitive() && differsOnlyInCase) { |