Use constexpr if in case it's available

NVIDIA · Oct 15, 2021 · f7e39a8 · f7e39a8
1 parent e53cb3c
commit f7e39a8
Showing 1 changed file with 5 additions and 3 deletions.
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,
@@ -125,6 +125,8 @@ namespace __merge_sort {
                                               debug_sync);
       }
     }
+
+    return cudaSuccess;
   }
 
   template <typename SORT_ITEMS,