From b953f942a12fd452d8ed0c20599b32ee8ddcd457 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 19 Jul 2013 17:28:11 +0200 Subject: Fixed ICE-5313 - slice checksums to pay attention to the class compact ID --- cpp/src/Slice/Checksum.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'cpp/src/Slice/Checksum.cpp') 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() << ") "; + } } } } -- cgit v1.2.3