[Boost-commit] svn:boost r84630 - in branches/release: boost/lockfree boost/lockfree/detail libs/lockfree libs/lockfree/test

Subject: [Boost-commit] svn:boost r84630 - in branches/release: boost/lockfree boost/lockfree/detail libs/lockfree libs/lockfree/test
From: tim_at_[hidden]
Date: 2013-06-04 05:28:17

Author: timblechmann
Date: 2013-06-04 05:28:15 EDT (Tue, 04 Jun 2013)
New Revision: 84630
URL: http://svn.boost.org/trac/boost/changeset/84630

Log:
lockfree: merge fixes from trunk

Properties modified: 
   branches/release/boost/lockfree/   (props changed)
   branches/release/libs/lockfree/   (props changed)
Text files modified: 
   branches/release/boost/lockfree/detail/freelist.hpp  |     2 +-                                      
   branches/release/boost/lockfree/spsc_queue.hpp       |     2 +-                                      
   branches/release/libs/lockfree/test/test_helpers.hpp |     2 +-                                      
   3 files changed, 3 insertions(+), 3 deletions(-)

Modified: branches/release/boost/lockfree/detail/freelist.hpp
==============================================================================
--- branches/release/boost/lockfree/detail/freelist.hpp	(original)
+++ branches/release/boost/lockfree/detail/freelist.hpp	2013-06-04 05:28:15 EDT (Tue, 04 Jun 2013)
@@ -319,7 +319,7 @@
 
     // unused ... only for API purposes
     template <typename Allocator>
-    compiletime_sized_freelist_storage(Allocator const & alloc, std::size_t count)
+    compiletime_sized_freelist_storage(Allocator const & /* alloc */, std::size_t /* count */)
     {}
 
     T * nodes(void) const

Modified: branches/release/boost/lockfree/spsc_queue.hpp
==============================================================================
--- branches/release/boost/lockfree/spsc_queue.hpp	(original)
+++ branches/release/boost/lockfree/spsc_queue.hpp	2013-06-04 05:28:15 EDT (Tue, 04 Jun 2013)
@@ -231,7 +231,7 @@
             size_t count0 = max_size - read_index;
             size_t count1 = avail - count0;
 
-            std::copy(internal_buffer + read_index, internal_buffer + max_size, it);
+            it = std::copy(internal_buffer + read_index, internal_buffer + max_size, it);
             std::copy(internal_buffer, internal_buffer + count1, it);
 
             new_read_index -= max_size;

Modified: branches/release/libs/lockfree/test/test_helpers.hpp
==============================================================================
--- branches/release/libs/lockfree/test/test_helpers.hpp	(original)
+++ branches/release/libs/lockfree/test/test_helpers.hpp	2013-06-04 05:28:15 EDT (Tue, 04 Jun 2013)
@@ -101,7 +101,7 @@
 
 struct dummy_functor
 {
-    void operator()(int arg) const
+    void operator()(int /* arg */) const
     {
     }
 };