summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/Checksum.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-07-19 17:28:11 +0200
committerJose <jose@zeroc.com>2013-07-19 17:28:11 +0200
commitb953f942a12fd452d8ed0c20599b32ee8ddcd457 (patch)
treead1ad18401f1fda99d405b4e75bd58e3b963d22b /cpp/src/Slice/Checksum.cpp
parentExpand tabs in distribution/makedist.py & remove references to nonexistent fi... (diff)
downloadice-b953f942a12fd452d8ed0c20599b32ee8ddcd457.tar.bz2
ice-b953f942a12fd452d8ed0c20599b32ee8ddcd457.tar.xz
ice-b953f942a12fd452d8ed0c20599b32ee8ddcd457.zip
Fixed ICE-5313 - slice checksums to pay attention to the class compact ID
Diffstat (limited to 'cpp/src/Slice/Checksum.cpp')
-rw-r--r--cpp/src/Slice/Checksum.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp
index e6f19cecd3c..94fa3bf3f6c 100644
--- a/cpp/src/Slice/Checksum.cpp
+++ b/cpp/src/Slice/Checksum.cpp
@@ -65,6 +65,12 @@ Slice::ChecksumVisitor::visitClassDefStart(const ClassDefPtr& p)
{
ostr << "class ";
}
+
+ if(p->compactId() >= 0)
+ {
+ ostr << "(" << p->compactId() << ") ";
+ }
+
ostr << p->name();
if(!bases.empty())
@@ -72,6 +78,10 @@ Slice::ChecksumVisitor::visitClassDefStart(const ClassDefPtr& p)
if(!bases.front()->isInterface())
{
ostr << " extends " << bases.front()->scoped();
+ if(bases.front()->compactId() >= 0)
+ {
+ ostr << "(" << bases.front()->compactId() << ") ";
+ }
bases.erase(bases.begin());
}
if(!bases.empty())
@@ -91,6 +101,10 @@ Slice::ChecksumVisitor::visitClassDefStart(const ClassDefPtr& p)
ostr << ", ";
}
ostr << (*q)->scoped();
+ if((*q)->compactId() >= 0)
+ {
+ ostr << "(" << (*q)->compactId() << ") ";
+ }
}
}
}