aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf/compilers
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.ru>2022-04-21 06:05:53 +0300
committersnermolaev <snermolaev@yandex-team.ru>2022-04-21 06:05:53 +0300
commit2626eab46614f7e15465cfad90d4e15caacea3ad (patch)
tree08fbf15cbf4f65518726e2eba644672200e95330 /build/conf/compilers
parentdb7a0aec549ae01e560c65abe07e720e5dd59fa4 (diff)
downloadydb-2626eab46614f7e15465cfad90d4e15caacea3ad.tar.gz
sync compiler confs
ref:251cb5483f811353cd648a02717de1e542038798
Diffstat (limited to 'build/conf/compilers')
-rw-r--r--build/conf/compilers/gnu_compiler.conf12
-rw-r--r--build/conf/compilers/msvc_compiler.conf4
2 files changed, 8 insertions, 8 deletions
diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 747e1793d1..ceef782eb2 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -82,16 +82,16 @@ _CXX_WARNINGS_CLANG=
when ($CLANG == "yes") {
_CXX_WARNINGS_CLANG=\
-Wimport-preprocessor-directive-pedantic \
- -Wno-undefined-var-template \
- -Wno-return-std-move \
+ -Wno-ambiguous-reversed-operator \
-Wno-defaulted-function-deleted \
- -Wno-pessimizing-move \
- -Wno-range-loop-construct \
-Wno-deprecated-anon-enum-enum-conversion \
-Wno-deprecated-enum-enum-conversion \
-Wno-deprecated-enum-float-conversion \
- -Wno-ambiguous-reversed-operator \
- -Wno-deprecated-volatile
+ -Wno-deprecated-volatile \
+ -Wno-pessimizing-move \
+ -Wno-range-loop-construct \
+ -Wno-return-std-move \
+ -Wno-undefined-var-template
# -Wno-unknown-warning-option
# For nvcc to accept the above.
diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf
index a4b63fe521..f70f984f97 100644
--- a/build/conf/compilers/msvc_compiler.conf
+++ b/build/conf/compilers/msvc_compiler.conf
@@ -123,8 +123,8 @@ _C_DEFINES=\
/D__STDC_FORMAT_MACROS \
/D_USING_V110_SDK71_ \
/D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES \
- /DNOMINMAX \
- /DWIN32_LEAN_AND_MEAN
+ /DWIN32_LEAN_AND_MEAN \
+ /DNOMINMAX
_C_DEFINES+=$_DEFINES_ARCH
_C_DEFINES+=$_DEFINES_WIN32_WINNT