From 0a9256c5b2bd75568c25130c819b383f8871c179 Mon Sep 17 00:00:00 2001
From: Kenny Kerr <kenny.kerr@microsoft.com>
Date: Tue, 15 Oct 2019 09:51:06 -0700
Subject: [PATCH] static_assert

---
 strings/base_array.h | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/strings/base_array.h b/strings/base_array.h
index 55a5047cd..ff4cfece7 100644
--- a/strings/base_array.h
+++ b/strings/base_array.h
@@ -31,27 +31,17 @@ WINRT_EXPORT namespace winrt
             array_view(value, N)
         {}
 
-        template <typename = std::enable_if_t<std::is_same_v<T, bool>>>
-        array_view(std::vector<bool>& value) noexcept
-        {
-            static_assert(false, "Cannot use std::vector<bool> as an array_view. Consider std::array or std::unique_ptr<bool[]>.");
-        }
-
-        template <typename = std::enable_if_t<std::is_same_v<T, bool>>>
-        array_view(std::vector<bool> const& value) noexcept
-        {
-            static_assert(false, "Cannot use std::vector<bool> as an array_view. Consider std::array or std::unique_ptr<bool[]>.");
-        }
-
         template <typename C>
         array_view(std::vector<C>& value) noexcept :
-            array_view(value.data(), static_cast<size_type>(value.size()))
-        {}
+            array_view(data(value), static_cast<size_type>(value.size()))
+        {
+        }
 
         template <typename C>
         array_view(std::vector<C> const& value) noexcept :
-            array_view(value.data(), static_cast<size_type>(value.size()))
-        {}
+            array_view(data(value), static_cast<size_type>(value.size()))
+        {
+        }
 
         template <typename C, size_t N>
         array_view(std::array<C, N>& value) noexcept :
@@ -208,6 +198,22 @@ WINRT_EXPORT namespace winrt
 
         pointer m_data{ nullptr };
         size_type m_size{ 0 };
+
+    private:
+
+        template <typename C>
+        auto data(std::vector<C> const& value) noexcept
+        {
+            static_assert(!std::is_same_v<C, bool>, "Cannot use std::vector<bool> as an array_view. Consider std::array or std::unique_ptr<bool[]>.");
+            return value.data();
+        }
+
+        template <typename C>
+        auto data(std::vector<C>& value) noexcept
+        {
+            static_assert(!std::is_same_v<C, bool>, "Cannot use std::vector<bool> as an array_view. Consider std::array or std::unique_ptr<bool[]>.");
+            return value.data();
+        }
     };
 
     template <typename T>