From b4cb0fe31deb8f971367143d4ad54d0ea8efc424 Mon Sep 17 00:00:00 2001
From: David Fontaine <dfontainenvidia@users.noreply.github.com>
Date: Mon, 2 Jun 2014 15:52:56 -0700
Subject: [PATCH 1/2] Replace remaining non-test use of std::min with
 thrust::min in max_grid_size

---
 thrust/system/cuda/detail/detail/stable_merge_sort.inl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/thrust/system/cuda/detail/detail/stable_merge_sort.inl b/thrust/system/cuda/detail/detail/stable_merge_sort.inl
index 54cf069fa..8ee245a75 100644
--- a/thrust/system/cuda/detail/detail/stable_merge_sort.inl
+++ b/thrust/system/cuda/detail/detail/stable_merge_sort.inl
@@ -43,6 +43,7 @@
 #include <thrust/system/cuda/detail/block/copy.h>
 #include <thrust/pair.h>
 #include <thrust/tuple.h>
+#include <thrust/extrema.h>
 #include <thrust/detail/minmax.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
@@ -127,7 +128,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()
 
 

From 2addc1e2fc5ef694bdc53e96e1ada77ab5ec8a25 Mon Sep 17 00:00:00 2001
From: David Fontaine <dfontainenvidia@users.noreply.github.com>
Date: Wed, 4 Jun 2014 15:12:32 -0700
Subject: [PATCH 2/2] Don't need <thrust/extrema.h> as more specific
 <thrust/detail/minmax.h> is already included providing thrust::min.

---
 thrust/system/cuda/detail/detail/stable_merge_sort.inl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/thrust/system/cuda/detail/detail/stable_merge_sort.inl b/thrust/system/cuda/detail/detail/stable_merge_sort.inl
index 8ee245a75..763d9b006 100644
--- a/thrust/system/cuda/detail/detail/stable_merge_sort.inl
+++ b/thrust/system/cuda/detail/detail/stable_merge_sort.inl
@@ -43,7 +43,6 @@
 #include <thrust/system/cuda/detail/block/copy.h>
 #include <thrust/pair.h>
 #include <thrust/tuple.h>
-#include <thrust/extrema.h>
 #include <thrust/detail/minmax.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>