diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-09-15 17:21:38 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-09-15 17:21:38 -0700 |
| commit | 1c1bff5336eb239ea19622dcbde3d47553b55907 (patch) | |
| tree | 2d02cbe24bd2d99783546063d23207ce99b5e2aa /matlab/src/IceMatlab/Util.cpp | |
| parent | changes for compatibility with MATLAB R2016a (diff) | |
| download | ice-1c1bff5336eb239ea19622dcbde3d47553b55907.tar.bz2 ice-1c1bff5336eb239ea19622dcbde3d47553b55907.tar.xz ice-1c1bff5336eb239ea19622dcbde3d47553b55907.zip | |
Adding support for Slice classes and optional values; Adding more tests
Diffstat (limited to 'matlab/src/IceMatlab/Util.cpp')
| -rw-r--r-- | matlab/src/IceMatlab/Util.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/matlab/src/IceMatlab/Util.cpp b/matlab/src/IceMatlab/Util.cpp index d4c15b7255e..8414c716f2e 100644 --- a/matlab/src/IceMatlab/Util.cpp +++ b/matlab/src/IceMatlab/Util.cpp @@ -66,7 +66,7 @@ IceMatlab::createStringFromUTF8(const string& s) #else u16string utf16 = wstring_convert<codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(s.data()); #endif - mwSize dims[2] = { 1, utf16.size() }; + mwSize dims[2] = { 1, static_cast<mwSize>(utf16.size()) }; mxArray* r = mxCreateCharArray(2, dims); mxChar* buf = mxGetChars(r); int i = 0; @@ -440,6 +440,7 @@ IceMatlab::convertException(const std::exception& exc) } catch(const Ice::UnsupportedEncodingException& e) { + params[idx++] = createStringFromUTF8(e.reason); params[idx++] = createEncodingVersion(e.bad); params[idx++] = createEncodingVersion(e.supported); } |