diff options
| author | Jose <jose@zeroc.com> | 2018-02-08 17:23:26 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-02-08 17:23:26 +0100 |
| commit | 41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c (patch) | |
| tree | 92eda1d6156d91d4bfce18f8fc06820af1e401ff /matlab/src/Util.cpp | |
| parent | Remove old files (diff) | |
| parent | Fixed matlab check for testing (diff) | |
| download | ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.tar.bz2 ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.tar.xz ice-41a4ea50bba42cd4585244f5a8e3ccbc6c20da4c.zip | |
Merge branch '3.7' of github.com:zeroc-ice/ice into 3.7
Diffstat (limited to 'matlab/src/Util.cpp')
| -rw-r--r-- | matlab/src/Util.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/matlab/src/Util.cpp b/matlab/src/Util.cpp index 2ddc7e6dc1d..3e1e92998ac 100644 --- a/matlab/src/Util.cpp +++ b/matlab/src/Util.cpp @@ -535,6 +535,21 @@ IceMatlab::createResultException(mxArray* ex) return r; } +static const char* optionalFields[] = {"hasValue", "value"}; + +mxArray* +IceMatlab::createOptionalValue(bool hasValue, mxArray* value) +{ + mwSize dims[2] = {1, 1}; + auto r = mxCreateStructArray(2, dims, 2, optionalFields); + mxSetFieldByNumber(r, 0, 0, createBool(hasValue)); + if(hasValue) + { + mxSetFieldByNumber(r, 0, 1, value); + } + return r; +} + mxArray* IceMatlab::createStringList(const vector<string>& v) { |