Skip to content

Commit c87b646

Browse files
committed
Merge branch 'release/8.0.38' into master-itch
2 parents 2418ae1 + a1a527a commit c87b646

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,13 @@ set(CMAKE_CXX_STANDARD 17)
204204
set(CMAKE_CXX_STANDARD_REQUIRED ON)
205205

206206
set(WB_CXXFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-deprecated -Wno-deprecated-copy -Wno-deprecated-declarations -Wno-overloaded-virtual)
207-
set(WB_CFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-deprecated -Wno-deprecated-copy -Wno-deprecated-declarations -Wno-overloaded-virtual)
207+
set(WB_CFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-deprecated -Wno-deprecated-copy -Wno-deprecated-declarations -Wno-overloaded-virtual)
208+
209+
include(CheckCXXCompilerFlag)
210+
check_cxx_compiler_flag(-Wtemplate-id-cdtor COMPILER_SUPPORTS_TEMPLATE_ID_CDTOR)
211+
if(COMPILER_SUPPORTS_TEMPLATE_ID_CDTOR)
212+
list(APPEND WB_CXXFLAGS -Wno-error=template-id-cdtor)
213+
endif()
208214

209215
if(BUILD_FOR_GCOV)
210216
message ("Enable GCOV due to BUILD_FOR_GCOV")

License.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
Licensing Information User Manual
22

3-
MySQL Workbench 8.0.36 Community
3+
MySQL Workbench 8.0.38 Community
44
__________________________________________________________________
55

66
Introduction
77

88
This License Information User Manual contains Oracle's product license
99
and other licensing information, including licensing information for
1010
third-party software which may be included in this distribution of
11-
MySQL Workbench 8.0.36 Community.
11+
MySQL Workbench 8.0.38 Community.
1212

13-
Last updated: May 2024
13+
Last updated: June 2024
1414

1515
Licensing Information
1616

17-
This release of MySQL Workbench 8.0.36 Community is brought to you by
17+
This release of MySQL Workbench 8.0.38 Community is brought to you by
1818
the MySQL team at Oracle. This software is released under version 2 of
1919
the GNU General Public License (GPLv2), as set forth below, with the
2020
following additional permissions:
2121

22-
This distribution of MySQL Workbench 8.0.36 Community is designed to
22+
This distribution of MySQL Workbench 8.0.38 Community is designed to
2323
work with certain software (including but not limited to OpenSSL) that
2424
is licensed under separate terms, as designated in a particular file or
2525
component or in the license documentation. Without limiting your rights

library/ssh/SSHSftp.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <unistd.h>
3131
#endif
3232
#include <vector>
33+
#include <algorithm>
3334
#include "SSHSftp.h"
3435

3536
DEFAULT_LOG_DOMAIN("SSHSftp")

0 commit comments

Comments
 (0)