diff options
| author | Jose <jose@zeroc.com> | 2019-10-31 19:34:45 +0100 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-02-18 13:55:04 -0500 |
| commit | 90c0c17ad742a7291a3e1e2744ae534544a74bdb (patch) | |
| tree | e5075526bfec298b43dd824681c8e5171605b35e | |
| parent | MATLAB fixes (diff) | |
| download | ice-90c0c17ad742a7291a3e1e2744ae534544a74bdb.tar.bz2 ice-90c0c17ad742a7291a3e1e2744ae534544a74bdb.tar.xz ice-90c0c17ad742a7291a3e1e2744ae534544a74bdb.zip | |
MATLAB build fixes
| -rw-r--r-- | matlab/src/Util.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/matlab/src/Util.cpp b/matlab/src/Util.cpp index c72be68fc3d..87966cdeb1e 100644 --- a/matlab/src/Util.cpp +++ b/matlab/src/Util.cpp @@ -2,6 +2,9 @@ // Copyright (c) ZeroC, Inc. All rights reserved. // +// COMPILERFIX: codecvt_utf8_utf16 is deprecated in C++17 +#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING 1 + #include <Ice/LocalException.h> #include <iostream> #include <string> @@ -685,7 +688,7 @@ string IceMatlab::idToClass(const string& id) { auto ids = splitScopedName(id); - transform(ids.begin(), ids.end(), ids.begin(), ptr_fun(lookupKwd)); + transform(ids.begin(), ids.end(), ids.begin(), [](const auto& id) -> auto { return lookupKwd(id); }); stringstream result; for(auto i = ids.begin(); i != ids.end(); ++i) { |