From a7f7cfe4f9169ee1610aa3d11a5d1dcb98aa4b11 Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Mon, 26 Sep 2016 10:11:29 -0400
Subject: [PATCH] Update brigand.hpp to get corrections for MSVC2013.

---
 vtkm/internal/brigand.hpp | 139 ++++++++++++++++++++------------------
 1 file changed, 73 insertions(+), 66 deletions(-)

diff --git a/vtkm/internal/brigand.hpp b/vtkm/internal/brigand.hpp
index ea955372e..0563fe052 100644
--- a/vtkm/internal/brigand.hpp
+++ b/vtkm/internal/brigand.hpp
@@ -439,76 +439,83 @@ namespace brigand
 {
 namespace detail
 {
-	constexpr std::size_t count_bools(bool const * const begin, bool const * const end,
-		std::size_t n)
-	{
-		return begin == end ? n : detail::count_bools(begin + 1, end, n + *begin);
-	}
-    template <bool... Bs>
-    struct template_count_bools
-    {
-        using type = ::brigand::size_t<0>;
-    };
-    template <bool B, bool... Bs>
-    struct template_count_bools<B, Bs...>
-    {
-        using type = ::brigand::size_t<B + template_count_bools<Bs...>::type::value>;
-    };
-    template <bool B1, bool B2, bool B3, bool B4, bool B5, bool B6, bool B7, bool B8, bool B9,
-              bool B10, bool B11, bool B12, bool B13, bool B14, bool B15, bool B16, bool... Bs>
-    struct template_count_bools<B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15,
-                                B16, Bs...>
-    {
-        using type =
-            ::brigand::size_t<B1 + B2 + B3 + B4 + B5 + B6 + B7 + B8 + B9 + B10 + B11 + B12 + B13 +
-                              B14 + B15 + B16 + template_count_bools<Bs...>::type::value>;
-    };
+#if defined(BRIGAND_COMP_GCC) || defined(BRIGAND_COMP_CLANG)  //not MSVC
+  constexpr std::size_t count_bools(bool const * const begin, bool const * const end,std::size_t n)
+  {
+    return begin == end ? n : detail::count_bools(begin + 1, end, n + *begin);
+  }
+#endif
+  template <bool... Bs>
+  struct template_count_bools
+  {
+      using type = ::brigand::size_t<0>;
+  };
+  template <bool B, bool... Bs>
+  struct template_count_bools<B, Bs...>
+  {
+    using tail_t = typename template_count_bools<Bs...>::type;
+    using type = ::brigand::size_t<B + tail_t::value>;
+  };
+  template <bool B1, bool B2, bool B3, bool B4, bool B5, bool B6, bool B7, bool B8, bool B9,
+            bool B10, bool B11, bool B12, bool B13, bool B14, bool B15, bool B16, bool... Bs>
+  struct template_count_bools<B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15,
+                              B16, Bs...>
+  {
+    using tail_t = typename template_count_bools<Bs...>::type;
+    using type =  ::brigand::size_t < B1 + B2  + B3  + B4  + B5  + B6  + B7  + B8
+                                    + B9 + B10 + B11 + B12 + B13 + B14 + B15 + B16
+                                    + tail_t::value
+                                    >;
+  };
 }
+
 namespace lazy
 {
-    template <typename List, typename Pred>
-    struct count_if
-    {
-    };
-    template <template <typename...> class S, typename Pred>
-    struct count_if<S<>, Pred>
-    {
-        using type = ::brigand::size_t<0>;
-    };
-#if defined(BRIGAND_COMP_GCC) || defined(BRIGAND_COMP_CLANG)
-	template <template <typename...> class S, template <typename...> class F>
-	struct count_if<S<>, bind<F, _1>>
-	{
-		using type = ::brigand::size_t<0>;
-	};
-	template <template <typename...> class S, template <typename...> class F>
-	struct count_if<S<>, F<_1>>
-	{
-		using type = ::brigand::size_t<0>;
-	};
-	template <template<typename...> class S, typename... Ts, typename Pred>
-	struct count_if<S<Ts...>, Pred>
-	{
-		static constexpr bool s_v[] = { ::brigand::apply<Pred, Ts>::type::value... };
-		using type = brigand::size_t< ::brigand::detail::count_bools(s_v, s_v + sizeof...(Ts), 0u)>;
-	};
-    template <template <typename...> class S, typename... Ts, template <typename...> class F>
-    struct count_if<S<Ts...>, bind<F, _1>>
-    {
-		static constexpr bool s_v[] = { F<Ts>::value... };
-		using type = brigand::size_t< ::brigand::detail::count_bools(s_v, s_v + sizeof...(Ts), 0u)>;
-    };
-    template <template <typename...> class S, typename... Ts, template <typename...> class F>
-    struct count_if<S<Ts...>, F<_1>>
-    {
-		static constexpr bool s_v[] = { F<Ts>::type::value... };
-		using type = brigand::size_t< ::brigand::detail::count_bools(s_v, s_v + sizeof...(Ts), 0u)>;
-    };
+  template <typename List, typename Pred>
+  struct count_if
+  {
+  };
+  template <template <typename...> class S, typename Pred>
+  struct count_if<S<>, Pred>
+  {
+    using type = ::brigand::size_t<0>;
+  };
+#if defined(BRIGAND_COMP_GCC) || defined(BRIGAND_COMP_CLANG)  //not MSVC
+  template <template <typename...> class S, template <typename...> class F>
+  struct count_if<S<>, bind<F, _1>>
+  {
+    using type = ::brigand::size_t<0>;
+  };
+  template <template <typename...> class S, template <typename...> class F>
+  struct count_if<S<>, F<_1>>
+  {
+    using type = ::brigand::size_t<0>;
+  };
+  template <template<typename...> class S, typename... Ts, typename Pred>
+  struct count_if<S<Ts...>, Pred>
+  {
+    static constexpr bool s_v[] = { ::brigand::apply<Pred, Ts>::type::value... };
+    using type = brigand::size_t<::brigand::detail::count_bools(s_v, s_v + sizeof...(Ts), 0u)>;
+  };
+  template <template <typename...> class S, typename... Ts, template <typename...> class F>
+  struct count_if<S<Ts...>, bind<F, _1>>
+  {
+    static constexpr bool s_v[] = { F<Ts>::value... };
+    using type = brigand::size_t<::brigand::detail::count_bools(s_v, s_v + sizeof...(Ts), 0u)>;
+  };
+  template <template <typename...> class S, typename... Ts, template <typename...> class F>
+  struct count_if<S<Ts...>, F<_1>>
+  {
+    static constexpr bool s_v[] = { F<Ts>::type::value... };
+    using type = brigand::size_t<::brigand::detail::count_bools(s_v, s_v + sizeof...(Ts), 0u)>;
+  };
 #else
-	template <template <typename...> class S, typename... Ts, typename Pred>
-	struct count_if<S<Ts...>, Pred> : ::brigand::detail::template_count_bools< ::brigand::apply<Pred, Ts>::value...>
-	{
-	};
+  template <template <typename...> class S, typename... Ts, typename Pred>
+  struct count_if<S<Ts...>, Pred>
+  {
+    template<typename T> using val_t = brigand::apply<Pred, T>;
+    using type = typename ::brigand::detail::template_count_bools<val_t<Ts>::value...>::type;
+  };
 #endif
 }
 template <typename List, typename Pred>