Merge pull request #495 from dfontainenvidia/1.7.2

Replace remaining non-test use of std::min with thrust::min in max_grid_size
NVIDIA · Jun 4, 2014 · eff3a97 · eff3a97
2 parents 4d2d9fd + 2addc1e
commit eff3a97
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/thrust/system/cuda/detail/detail/stable_merge_sort.inl b/thrust/system/cuda/detail/detail/stable_merge_sort.inl
@@ -127,7 +127,7 @@ inline unsigned int max_grid_size(Size block_size)
   const unsigned int max_threads = properties.maxThreadsPerMultiProcessor * properties.multiProcessorCount;
   const unsigned int max_blocks  = properties.maxGridSize[0];
 
-  return std::min<unsigned int>(max_blocks, 3 * max_threads / block_size);
+  return thrust::min<unsigned int>(max_blocks, 3 * max_threads / block_size);
 } // end max_grid_size()