From 078cbc2205fb91eae166db9b208576536b48837b Mon Sep 17 00:00:00 2001
From: Rick Winter <rick.winter@microsoft.com>
Date: Fri, 26 Jun 2020 09:45:29 -0700
Subject: [PATCH] Fix for non-msvc std lib (#222)

---
 sdk/core/azure-core/inc/nullable.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk/core/azure-core/inc/nullable.hpp b/sdk/core/azure-core/inc/nullable.hpp
index 23665819f..082e39fde 100644
--- a/sdk/core/azure-core/inc/nullable.hpp
+++ b/sdk/core/azure-core/inc/nullable.hpp
@@ -199,9 +199,9 @@ namespace Azure { namespace Core {
     template <
         class U = T,
         typename std::enable_if<
-            std::is_convertible_v<
+            std::is_convertible<
                 const T&,
-                typename std::remove_cv<T>::type> && std::is_convertible_v<U, T>,
+                typename std::remove_cv<T>::type>::value && std::is_convertible<U, T>::value,
             int>::type
         = 0>
     constexpr typename std::remove_cv<T>::type ValueOr(U&& other) const&
@@ -217,9 +217,9 @@ namespace Azure { namespace Core {
     template <
         class U = T,
         typename std::enable_if<
-            std::is_convertible_v<
+            std::is_convertible<
                 T,
-                typename std::remove_cv<T>::type> && std::is_convertible_v<U, T>,
+                typename std::remove_cv<T>::type>::value && std::is_convertible<U, T>::value,
             int>::type
         = 0>
     constexpr typename std::remove_cv<T>::type ValueOr(U&& other) &&