From 3c5ae4cc9cedc84b8f2d88ae49909ba5e7d97181 Mon Sep 17 00:00:00 2001 From: Leo Yuriev Date: Mon, 3 Jul 2017 12:50:48 +0300 Subject: [PATCH] mdbx: disable C4548 as workaround for buggy WinSDK 10.0.10240.0 --- mdbx.h | 2 ++ src/bits.h | 1 + src/osal.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/mdbx.h b/mdbx.h index 65ff15e4..d01bd4f3 100644 --- a/mdbx.h +++ b/mdbx.h @@ -53,6 +53,8 @@ #ifdef _MSC_VER #pragma warning(push, 1) +#pragma warning(disable : 4548) /* expression before comma has no effect; \ + expected expression with side - effect */ #pragma warning(disable : 4530) /* C++ exception handler used, but unwind \ * semantics are not enabled. Specify /EHsc */ #pragma warning(disable : 4577) /* 'noexcept' used with no exception handling \ diff --git a/src/bits.h b/src/bits.h index e72bdfa2..dcdafb0a 100644 --- a/src/bits.h +++ b/src/bits.h @@ -53,6 +53,7 @@ #pragma warning(disable : 4324) /* 'xyz': structure was padded due to alignment specifier */ #pragma warning(disable : 4310) /* cast truncates constant value */ #pragma warning(disable : 4820) /* bytes padding added after data member for aligment */ +#pragma warning(disable : 4548) /* expression before comma has no effect; expected expression with side - effect */ #endif /* _MSC_VER (warnings) */ #include "../mdbx.h" diff --git a/src/osal.h b/src/osal.h index 3fd869f0..731c86b5 100644 --- a/src/osal.h +++ b/src/osal.h @@ -21,6 +21,8 @@ #ifdef _MSC_VER #pragma warning(push, 1) +#pragma warning(disable : 4548) /* expression before comma has no effect; \ + expected expression with side - effect */ #pragma warning(disable : 4530) /* C++ exception handler used, but unwind \ * semantics are not enabled. Specify /EHsc */ #pragma warning(disable : 4577) /* 'noexcept' used with no exception handling \