[ROCm 6.0.1] Fix merge error in #2652 that affects #2644. (#2658)

atamazov · web-flow · commit 6a7e1a54cb60 · 2024-01-05T11:38:14.000-08:00
diff --git a/src/kernels/miopen_type_traits.hpp b/src/kernels/miopen_type_traits.hpp
@@ -76,7 +76,7 @@ struct remove_cv
     typedef typename remove_volatile<typename remove_const<T>::type>::type type;
 };
 
-#if HIP_PACKAGE_VERSION_FLAT >= 6001000000ULL && HIP_PACKAGE_VERSION_FLAT < 6001024000ULL
+#if HIP_PACKAGE_VERSION_FLAT >= 6000024000ULL && HIP_PACKAGE_VERSION_FLAT < 6001024000ULL
 template <class T, T v>
 struct integral_constant
 {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ struct remove_cv`
`76`	`76`	`typedef typename remove_volatile<typename remove_const<T>::type>::type type;`
`77`	`77`	`};`
`78`	`78`
`79`		`-#if HIP_PACKAGE_VERSION_FLAT >= 6001000000ULL && HIP_PACKAGE_VERSION_FLAT < 6001024000ULL`
	`79`	`+#if HIP_PACKAGE_VERSION_FLAT >= 6000024000ULL && HIP_PACKAGE_VERSION_FLAT < 6001024000ULL`
`80`	`80`	`template <class T, T v>`
`81`	`81`	`struct integral_constant`
`82`	`82`	`{`