diff options
| author | Jose <jose@zeroc.com> | 2019-07-30 12:45:29 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-31 13:13:40 +0200 |
| commit | 3e71d9e1a29bc8169452b039bb723406ff8ef0fe (patch) | |
| tree | cfde39529b1a21d6f4c4e87b2a92a366eafc9993 /cpp/src/Slice | |
| parent | Update .npmignore to ignore .tgz files (diff) | |
| download | ice-3e71d9e1a29bc8169452b039bb723406ff8ef0fe.tar.bz2 ice-3e71d9e1a29bc8169452b039bb723406ff8ef0fe.tar.xz ice-3e71d9e1a29bc8169452b039bb723406ff8ef0fe.zip | |
Fixes for C++ & Swift generated code - Close #458
Diffstat (limited to 'cpp/src/Slice')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 0ea48a5a2d1..de253779684 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -1619,8 +1619,12 @@ Slice::writeStreamHelpers(Output& out, } void -Slice::writeIceTuple(::IceUtilInternal::Output& out, const string& scope, DataMemberList dataMembers, int typeCtx) +Slice::writeIceTuple(::IceUtilInternal::Output& out, DataMemberList dataMembers, int typeCtx) { + // + // Use an empty scope to get full qualified names from calls to typeToString. + // + const string scope = ""; out << nl << "std::tuple<"; for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) { diff --git a/cpp/src/Slice/CPlusPlusUtil.h b/cpp/src/Slice/CPlusPlusUtil.h index b8fa3ad9e46..0380971c617 100644 --- a/cpp/src/Slice/CPlusPlusUtil.h +++ b/cpp/src/Slice/CPlusPlusUtil.h @@ -59,7 +59,7 @@ void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const Operat void writeMarshalUnmarshalDataMemberInHolder(IceUtilInternal::Output&, const std::string&, const DataMemberPtr&, bool); void writeMarshalUnmarshalAllInHolder(IceUtilInternal::Output&, const std::string&, const DataMemberList&, bool, bool); void writeStreamHelpers(::IceUtilInternal::Output&, const ContainedPtr&, DataMemberList, bool, bool, bool); -void writeIceTuple(::IceUtilInternal::Output&, const std::string&, DataMemberList, int); +void writeIceTuple(::IceUtilInternal::Output&, DataMemberList, int); bool findMetaData(const std::string&, const ClassDeclPtr&, std::string&); bool findMetaData(const std::string&, const StringList&, std::string&); |