summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/Parser.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-04-09 17:39:04 +0000
committerMarc Laukien <marc@zeroc.com>2002-04-09 17:39:04 +0000
commit57c7d83e67c2663828e086ab096937b772886073 (patch)
treeec2a306fc70a037ab4bd4c65169c00325dd8fba3 /cpp/src/Slice/Parser.cpp
parentFix network error. (diff)
downloadice-57c7d83e67c2663828e086ab096937b772886073.tar.bz2
ice-57c7d83e67c2663828e086ab096937b772886073.tar.xz
ice-57c7d83e67c2663828e086ab096937b772886073.zip
fixed hyperlink problem
Diffstat (limited to 'cpp/src/Slice/Parser.cpp')
-rw-r--r--cpp/src/Slice/Parser.cpp33
1 files changed, 13 insertions, 20 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 156a44a2c94..2a4464349c4 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -118,6 +118,18 @@ Slice::Contained::comment()
return _comment;
}
+int
+Slice::Contained::includeLevel()
+{
+ return _includeLevel;
+}
+
+void
+Slice::Contained::updateIncludeLevel()
+{
+ _includeLevel = min(_includeLevel, _unit->currentIncludeLevel());
+}
+
list<string>
Slice::Contained::getMetaData()
{
@@ -157,6 +169,7 @@ Slice::Contained::Contained(const ContainerPtr& container, const string& name) :
_unit->addContent(this);
_file = _unit->currentFile();
_comment = _unit->currentComment();
+ _includeLevel = _unit->currentIncludeLevel();
}
// ----------------------------------------------------------------------
@@ -900,18 +913,6 @@ Slice::Container::enums()
return result;
}
-int
-Slice::Container::includeLevel()
-{
- return _includeLevel;
-}
-
-void
-Slice::Container::updateIncludeLevel()
-{
- _includeLevel = min(_includeLevel, _unit->currentIncludeLevel());
-}
-
bool
Slice::Container::hasProxies()
{
@@ -1103,14 +1104,6 @@ Slice::Container::containerRecDependencies(set<ConstructedPtr>& dependencies)
Slice::Container::Container(const UnitPtr& unit) :
SyntaxTreeBase(unit)
{
- if (_unit)
- {
- _includeLevel = _unit->currentIncludeLevel();
- }
- else
- {
- _includeLevel = 0;
- }
}
bool