diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:17:38 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:17:38 +0000 |
| commit | 282b652028ca79baa5a43aa5356d779a688947a8 (patch) | |
| tree | 66205f73da3a22532dc0defa6132778e258ded8e /storage/rocksdb/rdb_sst_info.cc | |
| parent | d995dd2865b4dd5d01175594ed667cfe8ce41712 (diff) | |
| download | mariadb-git-282b652028ca79baa5a43aa5356d779a688947a8.tar.gz | |
Windows, compiling : reenable warning C4996 (deprecated functions)
But set _CRT_NONSTDC_NO_WARNINGS to silence silly warnings about
ANSI C function being non-standard
Remove now deprecated GetVersion()/GetVersionEx(),except single case
where where it is really needed, in feedback plugin. Remove checks for
Windows NT.
Avoid old IPv4-only inet_aton, which generated the warning.
Diffstat (limited to 'storage/rocksdb/rdb_sst_info.cc')
| -rw-r--r-- | storage/rocksdb/rdb_sst_info.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/rocksdb/rdb_sst_info.cc b/storage/rocksdb/rdb_sst_info.cc index da3a3d94354..70f19c6af11 100644 --- a/storage/rocksdb/rdb_sst_info.cc +++ b/storage/rocksdb/rdb_sst_info.cc @@ -109,6 +109,9 @@ Rdb_sst_file_ordered::Rdb_sst_file::put(const rocksdb::Slice &key, #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif +#ifdef _MSC_VER +#pragma warning (disable : 4996) +#endif return m_sst_file_writer->Add(key, value); } |