From ea599a66b7a053388922e75c17fd9af051021695 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 23 Jan 2018 15:40:58 +0000 Subject: [PATCH] Disable 'conditional expression is constant' on older Visual C++ --- include/boost/unordered/unordered_map.hpp | 2 +- include/boost/unordered/unordered_set.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp index f81213c3..acaf99c6 100644 --- a/include/boost/unordered/unordered_map.hpp +++ b/include/boost/unordered/unordered_map.hpp @@ -26,9 +26,9 @@ #if defined(BOOST_MSVC) #pragma warning(push) -#if BOOST_MSVC >= 1400 // conditional expression is constant #pragma warning(disable : 4127) +#if BOOST_MSVC >= 1400 // the inline specifier cannot be used when a friend declaration refers to a // specialization of a function template #pragma warning(disable : 4396) diff --git a/include/boost/unordered/unordered_set.hpp b/include/boost/unordered/unordered_set.hpp index 865c7da4..92af2c01 100644 --- a/include/boost/unordered/unordered_set.hpp +++ b/include/boost/unordered/unordered_set.hpp @@ -25,9 +25,9 @@ #if defined(BOOST_MSVC) #pragma warning(push) -#if BOOST_MSVC >= 1400 // conditional expression is constant #pragma warning(disable : 4127) +#if BOOST_MSVC >= 1400 // the inline specifier cannot be used when a friend declaration refers to a // specialization of a function template #pragma warning(disable : 4396)