diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 23:32:02 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:19:40 +0000 |
| commit | 8fe04a3df37d65254142c6d1297eda32c1013f7f (patch) | |
| tree | 46942e3ffc78ca7de8ae593d759993f83fd85c68 /cmake | |
| parent | 282b652028ca79baa5a43aa5356d779a688947a8 (diff) | |
| download | mariadb-git-8fe04a3df37d65254142c6d1297eda32c1013f7f.tar.gz | |
Windows, compile : reenable previously disabled warning C4291
no matching operator delete found; memory will not be freed if initialization throws an exception
Added a no-op delete() for MEM_ROOT based placement-new()
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 8490cb3b1a9..851a42e7ad1 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -147,7 +147,7 @@ IF(MSVC) #TODO: update the code and remove the disabled warnings SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4700 /we4311 /we4477 /we4302 /we4090") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4291 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4099 /we4700 /we4311 /we4477 /we4302 /we4090") ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS) IF(MYSQL_MAINTAINER_MODE MATCHES "ERR") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") |