summaryrefslogtreecommitdiff
path: root/cpp/src/slice2js/Gen.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-07-09 17:28:56 +0200
committerJose <jose@zeroc.com>2019-07-09 17:28:56 +0200
commit9bb1f40c2149edadcfc24892635b1f36d649cc6f (patch)
treeb7bf38fb444a3a4a1eef23bb998ec065953f5ff3 /cpp/src/slice2js/Gen.cpp
parentFix ice.xcodeproj path issue (diff)
parentRemove forward declarations limitation - Close #97 (diff)
downloadice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.tar.bz2
ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.tar.xz
ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.zip
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/slice2js/Gen.cpp')
-rw-r--r--cpp/src/slice2js/Gen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index 1a6c60177b1..f59050a784e 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -2180,7 +2180,7 @@ Slice::Gen::TypesVisitor::encodeTypeForOperation(const TypePtr& type)
if(proxy)
{
ClassDefPtr def = proxy->_class()->definition();
- if(def->isInterface() || def->allOperations().size() > 0)
+ if(!def || def->isAbstract())
{
return "\"" + fixId(proxy->_class()->scoped() + "Prx") + "\"";
}