Index: boost/lockfree/spsc_queue.hpp

===================================================================

--- boost/lockfree/spsc_queue.hpp	(revision 80625)

+++ boost/lockfree/spsc_queue.hpp	(working copy)

@@ -96,7 +96,7 @@

         if (avail == 0)

             return 0;

 

-        input_count = std::min(input_count, avail);

+        input_count = (std::min)(input_count, avail);

 

         size_t new_write_index = write_index + input_count;

 

@@ -131,7 +131,7 @@

             return begin;

 

         size_t input_count = std::distance(begin, end);

-        input_count = std::min(input_count, avail);

+        input_count = (std::min)(input_count, avail);

 

         size_t new_write_index = write_index + input_count;

 

@@ -181,7 +181,7 @@

         if (avail == 0)

             return 0;

 

-        output_count = std::min(output_count, avail);

+        output_count = (std::min)(output_count, avail);

 

         size_t new_read_index = read_index + output_count;

 

Index: libs/lockfree/test/test_helpers.hpp

===================================================================

--- libs/lockfree/test/test_helpers.hpp	(revision 80625)

+++ libs/lockfree/test/test_helpers.hpp	(working copy)

@@ -70,9 +70,9 @@

             return false;

     }

 

-    int count_nodes(void) const

+    std::size_t count_nodes(void) const

     {

-        int ret = 0;

+        std::size_t ret = 0;

         for (int i = 0; i != buckets; ++i) {

             boost::mutex::scoped_lock lock (ref_mutex[i]);

             ret += data[i].size();