summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-02-13 20:40:50 +0100
committerJose <jose@zeroc.com>2017-02-13 20:44:40 +0100
commitbd4c5f908f33362fb705ba466f381a23ca90d1bb (patch)
treef64301a7c59d1d6524485ead41998033cfc722d9 /cpp/src
parentUpdate Ice Builder for Gradle version to 1.4.0 (diff)
downloadice-bd4c5f908f33362fb705ba466f381a23ca90d1bb.tar.bz2
ice-bd4c5f908f33362fb705ba466f381a23ca90d1bb.tar.xz
ice-bd4c5f908f33362fb705ba466f381a23ca90d1bb.zip
Fixed (ICE-7276) - Comparing struct with Ice::Unset results in error in Ruby
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Slice/RubyUtil.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 6364e88133e..87b766009be 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -1005,13 +1005,10 @@ Slice::Ruby::CodeVisitor::visitStructStart(const StructPtr& p)
_out.inc();
_out << nl << "return false if";
_out.inc();
+ _out << " !other.is_a? " << getAbsolute(p, IdentToUpper);
for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
{
- if(r != memberList.begin())
- {
- _out << " or";
- }
- _out << nl << "@" << r->fixedName << " != other." << r->fixedName;
+ _out << " or" << nl << "@" << r->fixedName << " != other." << r->fixedName;
}
_out.dec();
_out << nl << "true";