summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2008-04-17 18:45:01 +0200
committerBenoit Foucher <benoit@zeroc.com>2008-04-17 18:45:01 +0200
commita51597a6c13f1feb795fe3371a73953d9ac7002c (patch)
tree57a1fdcef549b07957c7e045d740760d1f481044 /cpp/src
parentFixed Parser.cpp assert (diff)
downloadice-a51597a6c13f1feb795fe3371a73953d9ac7002c.tar.bz2
ice-a51597a6c13f1feb795fe3371a73953d9ac7002c.tar.xz
ice-a51597a6c13f1feb795fe3371a73953d9ac7002c.zip
Reverted previous bogus fix.
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Slice/Parser.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index b08f2515bd2..c6816a19669 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -5095,16 +5095,12 @@ Slice::Unit::scanPosition(const char* s)
if(_currentLine == 0)
{
- if(!_topLevelFileStart)
+ if(currentFile != _topLevelFile)
{
type = Push;
line.erase(idx);
eraseWhiteSpace(line);
}
- else
- {
- _topLevelFileStart = false;
- }
}
else
{
@@ -5491,7 +5487,7 @@ Slice::Unit::parse(const string& filename, FILE* file, bool debug, Slice::Featur
_currentLine = 1;
_currentIncludeLevel = 0;
_featureProfile = profile;
- _topLevelFileStart = true;
+ _topLevelFile = normalizePath(filename);
pushContainer(this);
pushDefinitionContext();