Use constexpr if in case it's available

gevtushenko · gevtushenko · commit 13707fba6518 · 2021-10-15T14:15:06.000+03:00
diff --git a/thrust/system/cuda/detail/sort.h b/thrust/system/cuda/detail/sort.h
@@ -77,9 +77,9 @@ namespace __merge_sort {
       return cudaSuccess;
     }
 
-    if (STABLE::value)
+    THRUST_IF_CONSTEXPR(STABLE::value)
     {
-      if (SORT_ITEMS::value)
+      THRUST_IF_CONSTEXPR(SORT_ITEMS::value)
       {
         return cub::DeviceMergeSort::StableSortPairs(d_temp_storage,
                                                      temp_storage_bytes,
@@ -103,7 +103,7 @@ namespace __merge_sort {
     }
     else
     {
-      if (SORT_ITEMS::value)
+      THRUST_IF_CONSTEXPR(SORT_ITEMS::value)
       {
         return cub::DeviceMergeSort::SortPairs(d_temp_storage,
                                                temp_storage_bytes,

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,9 @@ namespace __merge_sort {`
`77`	`77`	`return cudaSuccess;`
`78`	`78`	`}`
`79`	`79`
`80`		`- if (STABLE::value)`
	`80`	`+ THRUST_IF_CONSTEXPR(STABLE::value)`
`81`	`81`	`{`
`82`		`- if (SORT_ITEMS::value)`
	`82`	`+ THRUST_IF_CONSTEXPR(SORT_ITEMS::value)`
`83`	`83`	`{`
`84`	`84`	`return cub::DeviceMergeSort::StableSortPairs(d_temp_storage,`
`85`	`85`	`temp_storage_bytes,`
`@@ -103,7 +103,7 @@ namespace __merge_sort {`
`103`	`103`	`}`
`104`	`104`	`else`
`105`	`105`	`{`
`106`		`- if (SORT_ITEMS::value)`
	`106`	`+ THRUST_IF_CONSTEXPR(SORT_ITEMS::value)`
`107`	`107`	`{`
`108`	`108`	`return cub::DeviceMergeSort::SortPairs(d_temp_storage,`
`109`	`109`	`temp_storage_bytes,`