From 80f6f4c4f4e419f33dde5e6fe8b273b91cb794f7 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 4 Jun 2021 11:04:06 +0200 Subject: [PATCH] fix compilation error (c++17) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit avoid this error cannot convert ‘noop_free’ (type ‘mysql_file_getline(char*, int, MYSQL_FILE*, bool)::’) to type ‘void (* const&)(void*) noexcept’ --- mysys/my_default.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysys/my_default.cc b/mysys/my_default.cc index 762248b02c42..04d92220466c 100644 --- a/mysys/my_default.cc +++ b/mysys/my_default.cc @@ -1180,7 +1180,7 @@ static mysql_file_getline_ret mysql_file_getline(char *buff, int size, /* If the supplied buff/size is enough to store the line, then we return the * buff itself. In this case, we use this noop deleter */ - static auto noop_free = [](void *) {}; + static auto noop_free = [](void *) noexcept {}; if (is_login_file) { if (mysql_file_ftell(file) == 0) {