summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-06-26 23:47:38 +0000
committerMarc Laukien <marc@zeroc.com>2002-06-26 23:47:38 +0000
commitc72eeaaafa03a11e1deb8fe542fdf8dfdd041fd8 (patch)
treedfb9c98f013ebf74628662c18655a65456adb942 /cpp
parentfixes (diff)
downloadice-c72eeaaafa03a11e1deb8fe542fdf8dfdd041fd8.tar.bz2
ice-c72eeaaafa03a11e1deb8fe542fdf8dfdd041fd8.tar.xz
ice-c72eeaaafa03a11e1deb8fe542fdf8dfdd041fd8.zip
fix
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/Slice/Parser.h2
-rw-r--r--cpp/src/Slice/Parser.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index c31ad18a8f3..63f40f00909 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -314,7 +314,7 @@ public:
bool hasClassDecls() const;
bool hasClassDefs() const;
bool hasOtherConstructedOrExceptions() const; // Exceptions or constructed types other than classes.
- std::string thisScope();
+ std::string thisScope() const;
void mergeModules();
void sort();
void sortContents();
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 6045aec0985..7a72d99b677 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1086,10 +1086,10 @@ Slice::Container::hasOtherConstructedOrExceptions() const
}
string
-Slice::Container::thisScope()
+Slice::Container::thisScope() const
{
string s;
- ContainedPtr contained = ContainedPtr::dynamicCast(this);
+ ContainedPtr contained = ContainedPtr::dynamicCast(const_cast<Container*>(this));
if(contained)
{
s = contained->scoped();