Make BRIGAND_COMP_CUDA_9PLUS capture all future versions of cuda

vtkm/internal/brigand.hpp

@@ -25,8 +25,8 @@
 #endif
 #endif
 #if defined(__CUDACC__)
-#if __CUDACC_VER_MAJOR__ == 9
-#define BRIGAND_COMP_CUDA_9
+#if __CUDACC_VER_MAJOR__ >= 9
+#define BRIGAND_COMP_CUDA_9PLUS
 #endif
 #define BRIGAND_COMP_CUDA
 #endif
@@ -259,7 +259,7 @@ namespace brigand
     };
 
     template<std::size_t N, typename Seq> struct at_impl;
-#if defined(BRIGAND_COMP_CUDA_9) || defined(BRIGAND_COMP_INTEL)
+#if defined(BRIGAND_COMP_CUDA_9PLUS) || defined(BRIGAND_COMP_INTEL)
     //Both CUDA 9 and the Intel 18 compiler series have a problem deducing the
     //type so we are just going
     template <std::size_t N, template <typename...> class L, class... Ts>
@@ -503,7 +503,7 @@ namespace lazy
         using type = ::brigand::size_t<0>;
     };
 
-#if defined(BRIGAND_COMP_CUDA_9)
+#if defined(BRIGAND_COMP_CUDA_9PLUS)
   //This was added for CUDA 9 RC1 and most likely will need CUDA
   //version guards
   template<class P, class T>
@@ -1551,7 +1551,7 @@ namespace detail
 namespace brigand
 {
 
-#if (defined(BRIGAND_COMP_GCC) || defined(BRIGAND_COMP_CLANG)) && !defined(BRIGAND_COMP_CUDA_9)
+#if (defined(BRIGAND_COMP_GCC) || defined(BRIGAND_COMP_CLANG)) && !defined(BRIGAND_COMP_CUDA_9PLUS)
   namespace lazy
   {
     template <typename L, typename Pred>