diff options
| author | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
| commit | fc886b010c01cccb8cca3ac4d92f1ebd7fc72295 (patch) | |
| tree | 51cf00a4a955efecc9c94527aeafcb25ffbe57b9 /cpp/src/Ice/Object.cpp | |
| parent | Simplify OutputStream creation (diff) | |
| parent | Fixed non-thread safe AMD dispatch, fixes #448 (#449) (diff) | |
| download | ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.bz2 ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.xz ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index effce176db2..78235ce4d62 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -155,7 +155,14 @@ Ice::Object::_iceD_ice_ids(Incoming& inS, const Current& current) inS.readEmptyParams(); vector<string> ret = ice_ids(current); OutputStream* ostr = inS.startWriteParams(); - ostr->write(&ret[0], &ret[0] + ret.size(), false); + if(ret.empty()) + { + ostr->write(ret); + } + else + { + ostr->write(&ret[0], &ret[0] + ret.size(), false); + } inS.endWriteParams(); return true; } |