summaryrefslogtreecommitdiff
path: root/matlab/src/Util.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'matlab/src/Util.cpp')
-rw-r--r--matlab/src/Util.cpp5
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)
{