summaryrefslogtreecommitdiff
path: root/matlab/src/IceMatlab/Util.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-10-09 21:58:46 +0200
committerJose <jose@zeroc.com>2017-10-09 21:58:46 +0200
commit5e445567683deebded1c12e78796e998cbf16ae8 (patch)
treeb854d4547e5b68225c1882290414a996c44002c8 /matlab/src/IceMatlab/Util.cpp
parentInternal code cleanup (diff)
downloadice-5e445567683deebded1c12e78796e998cbf16ae8.tar.bz2
ice-5e445567683deebded1c12e78796e998cbf16ae8.tar.xz
ice-5e445567683deebded1c12e78796e998cbf16ae8.zip
Update MATLAB build system
Diffstat (limited to 'matlab/src/IceMatlab/Util.cpp')
-rw-r--r--matlab/src/IceMatlab/Util.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/matlab/src/IceMatlab/Util.cpp b/matlab/src/IceMatlab/Util.cpp
index 6259061d7e7..f4f3dd1e452 100644
--- a/matlab/src/IceMatlab/Util.cpp
+++ b/matlab/src/IceMatlab/Util.cpp
@@ -237,7 +237,7 @@ IceMatlab::createStringMap(const map<string, string>& m)
else
{
mwSize dims[2] = {1, 0};
- dims[1] = m.size();
+ dims[1] = static_cast<int>(m.size());
auto keys = mxCreateCellArray(2, dims);
auto values = mxCreateCellArray(2, dims);
int idx = 0;
@@ -281,8 +281,8 @@ IceMatlab::getStringMap(mxArray* p, map<string, string>& m)
{
for(size_t i = 0; i < n; ++i)
{
- auto k = getStringFromUTF16(mxGetCell(keys, i));
- auto v = getStringFromUTF16(mxGetCell(values, i));
+ auto k = getStringFromUTF16(mxGetCell(keys, static_cast<int>(i)));
+ auto v = getStringFromUTF16(mxGetCell(values, static_cast<int>(i)));
m[k] = v;
}
mxDestroyArray(keys);
@@ -538,7 +538,7 @@ IceMatlab::createResultException(mxArray* ex)
mxArray*
IceMatlab::createStringList(const vector<string>& v)
{
- auto r = mxCreateCellMatrix(1, v.size());
+ auto r = mxCreateCellMatrix(1, static_cast<int>(v.size()));
mwIndex i = 0;
for(auto p = v.begin(); p != v.end(); ++p, ++i)
{