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/CPlusPlusUtil.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/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 853bbed5d49..0ea48a5a2d1 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -752,13 +752,13 @@ Slice::typeToString(const TypePtr& type, const string& scope, const StringList& // Non local classes without operations map to the base // proxy class shared_ptr<Ice::ObjectPrx> // - if(def && !def->isInterface() && def->allOperations().empty()) + if(!def || def->isAbstract()) { - return getUnqualified(cpp11BuiltinTable[Builtin::KindObjectProxy], scope); + return "::std::shared_ptr<" + getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">"; } else { - return "::std::shared_ptr<" + getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">"; + return getUnqualified(cpp11BuiltinTable[Builtin::KindObjectProxy], scope); } } else |