Refactor THRUST_STATIC_CONSTANT and rename it to

brycelelbach · brycelelbach · commit 3639cad946c4 · 2019-02-27T17:40:39.000-08:00
`THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT`.
diff --git a/thrust/detail/config/cpp_compatibility.h b/thrust/detail/config/cpp_compatibility.h
@@ -36,35 +36,44 @@
 #  define THRUST_DEFAULT = default;
 #  define THRUST_NOEXCEPT noexcept
 #  define THRUST_FINAL final
-#  define THRUST_STATIC_CONSTANT static constexpr
 #else
 #  define THRUST_CONSTEXPR 
 #  define THRUST_OVERRIDE
 #  define THRUST_DEFAULT {}
 #  define THRUST_NOEXCEPT throw()
 #  define THRUST_FINAL
-#  define THRUST_STATIC_CONSTANT static const
 #endif
 
 #ifndef THRUST_NODISCARD
 #  define THRUST_NODISCARD
 #endif
 
+// FIXME: Combine THRUST_INLINE_CONSTANT and
+// THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT into one macro when NVCC properly
+// supports `constexpr` globals in host and device code.
 #ifdef __CUDA_ARCH__
-#  if   THRUST_CPP_DIALECT >= 2017
-#    define THRUST_INLINE_CONSTANT inline const __device__
-#  elif THRUST_CPP_DIALECT >= 2011
-#    define THRUST_INLINE_CONSTANT static const __device__
+// FIXME: Add this when NVCC supports inline variables.
+//#  if   THRUST_CPP_DIALECT >= 2017
+//#    define THRUST_INLINE_CONSTANT                 inline constexpr
+//#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT inline constexpr
+#  if THRUST_CPP_DIALECT >= 2011
+#    define THRUST_INLINE_CONSTANT                 static constexpr
+#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static constexpr
 #  else
-#    define THRUST_INLINE_CONSTANT static const __device__
+#    define THRUST_INLINE_CONSTANT                 static const __device__
+#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static const
 #  endif
 #else
-#  if   THRUST_CPP_DIALECT >= 2017
-#    define THRUST_INLINE_CONSTANT inline constexpr
-#  elif THRUST_CPP_DIALECT >= 2011
-#    define THRUST_INLINE_CONSTANT static constexpr
+// FIXME: Add this when NVCC supports inline variables.
+//#  if   THRUST_CPP_DIALECT >= 2017
+//#    define THRUST_INLINE_CONSTANT                 inline constexpr
+//#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT inline constexpr
+#  if THRUST_CPP_DIALECT >= 2011
+#    define THRUST_INLINE_CONSTANT                 static constexpr
+#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static constexpr
 #  else
-#    define THRUST_INLINE_CONSTANT static const
+#    define THRUST_INLINE_CONSTANT                 static const
+#    define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static const
 #  endif
 #endif
 
diff --git a/thrust/detail/static_assert.h b/thrust/detail/static_assert.h
@@ -37,7 +37,7 @@ namespace detail
 template <typename, bool x>
 struct depend_on_instantiation
 {
-  THRUST_STATIC_CONSTANT bool value = x;
+  THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT bool value = x;
 };
 
 #if THRUST_CPP_DIALECT >= 2011
diff --git a/thrust/detail/type_traits.h b/thrust/detail/type_traits.h
@@ -40,7 +40,7 @@ namespace detail
  template<typename T, T v>
    struct integral_constant
    {
-     THRUST_STATIC_CONSTANT T value = v;
+     THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT T value = v;
 
      typedef T                       value_type;
      typedef integral_constant<T, v> type;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ namespace detail`
`37`	`37`	`template <typename, bool x>`
`38`	`38`	`struct depend_on_instantiation`
`39`	`39`	`{`
`40`		`- THRUST_STATIC_CONSTANT bool value = x;`
	`40`	`+ THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT bool value = x;`
`41`	`41`	`};`
`42`	`42`
`43`	`43`	`#if THRUST_CPP_DIALECT >= 2011`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ namespace detail`
`40`	`40`	`template<typename T, T v>`
`41`	`41`	`struct integral_constant`
`42`	`42`	`{`
`43`		`- THRUST_STATIC_CONSTANT T value = v;`
	`43`	`+ THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT T value = v;`
`44`	`44`
`45`	`45`	`typedef T value_type;`
`46`	`46`	`typedef integral_constant<T, v> type;`