diff options
| author | Jose <jose@zeroc.com> | 2019-07-09 17:28:56 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-09 17:28:56 +0200 |
| commit | 9bb1f40c2149edadcfc24892635b1f36d649cc6f (patch) | |
| tree | b7bf38fb444a3a4a1eef23bb998ec065953f5ff3 /cpp/src/Slice/JavaUtil.cpp | |
| parent | Fix ice.xcodeproj path issue (diff) | |
| parent | Remove forward declarations limitation - Close #97 (diff) | |
| download | ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.tar.bz2 ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.tar.xz ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 327e4b92a5d..78dd64f2080 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -3764,8 +3764,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type, if(proxy) { ClassDefPtr def = proxy->_class()->definition(); - assert(def); - if(def->isAbstract()) + if(!def || def->isAbstract()) { return getUnqualified(proxy->_class(), package, "", "Prx"); } |