Skip to content

Commit 172c7ac

Browse files
committed
WL#11226: Clear all compile warnings -- post push fixes
- do not add virtual ~DbDoc() dtor to not change the ABI - add _CRT_SECURE_NO_WARNINGS on Win also when using clang compiler - do not use set_compile_flag() for plain C compiler flags
1 parent 89e2bce commit 172c7ac

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ if(WERROR)
290290
set(WERROR -Werror)
291291
endif()
292292

293-
if(MSVC)
293+
if(MSVC OR TOOLSET_MSVC)
294294

295295
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
296296

cdk/extra/zlib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if(WIN32)
2525
# conformant name: _open. See online help for details.
2626

2727
if(CLANG)
28-
set_compiler_flag(-Wno-deprecated-declarations)
28+
add_compile_options(-Wno-deprecated-declarations)
2929
else()
3030
add_compile_options(/wd4996)
3131
endif()

include/mysqlx/devapi/document.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ DLL_WARNINGS_POP
172172
virtual Iterator begin();
173173
virtual Iterator end();
174174

175-
virtual ~DbDoc() {}
176-
177175
friend Impl;
178176
friend DocResult;
179177
friend Value;

0 commit comments

Comments
 (0)