From 6ecc56c289e3141039e3153f9f5354d74576b10a Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Fri, 17 Feb 2017 16:15:40 +0300
Subject: [PATCH] Revert "Use new BOOST_NO_CXX11_SFINAE_EXPR feature macro"

This reverts commit 98ee47effd627f57fe205862f092bd793e4836d6.

This is a temporary revert until Boost.Config master is updated to
provide BOOST_NO_CXX11_SFINAE_EXPR.
---
 include/boost/core/addressof.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/boost/core/addressof.hpp b/include/boost/core/addressof.hpp
index 0a2b46b..303bd0c 100644
--- a/include/boost/core/addressof.hpp
+++ b/include/boost/core/addressof.hpp
@@ -116,10 +116,12 @@ struct address_of<const volatile addressof_null_t> {
 
 } /* detail */
 
-#if defined(BOOST_NO_CXX11_SFINAE_EXPR) || \
+#if defined(BOOST_NO_SFINAE_EXPR) || \
     defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     defined(BOOST_NO_CXX11_CONSTEXPR) || \
-    defined(BOOST_NO_CXX11_DECLTYPE)
+    defined(BOOST_NO_CXX11_DECLTYPE) || \
+    BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1900)) || \
+    BOOST_WORKAROUND(BOOST_GCC, < 40800)
 #define BOOST_CORE_NO_CONSTEXPR_ADDRESSOF
 
 template<class T>