MSPriorityQueue refactoring, bug fix

[libcds.git] / tests / test-hdr / priority_queue / hdr_pqueue.h

diff --git a/tests/test-hdr/priority_queue/hdr_pqueue.h b/tests/test-hdr/priority_queue/hdr_pqueue.h
index 70366fa42e231c5b9201af6fbdff1e83585266be..c9cac170f83f556d7607f8051b75bc0375853159 100644 (file)
--- a/tests/test-hdr/priority_queue/hdr_pqueue.h
+++ b/tests/test-hdr/priority_queue/hdr_pqueue.h
@@ -114,14 +114,6 @@ namespace priority_queue {
             }
         };
 
-        struct move_functor
-        {
-            void operator()( int& dest, value_type const& src ) const
-            {
-                dest = src.k;
-            }
-        };
-
     protected:
         template <class PQueue>
         void test_bounded_with( PQueue& pq )
@@ -141,6 +133,9 @@ namespace priority_queue {
             // Push test
             for ( value_type * p = pFirst; p < pLast; ++p ) {
                 switch ( pq.size() & 3 ) {
+                    case 0:
+                        CPPUNIT_ASSERT( pq.push_with( [p]( value_type& dest ) { dest = *p; } ));
+                        break;
                     case 1:
                         CPPUNIT_ASSERT( pq.emplace( p->k, p->v ));
                         break;
@@ -182,7 +177,7 @@ namespace priority_queue {
                     nPrev = kv.k;
                 }
                 else {
-                    CPPUNIT_ASSERT( pq.pop_with( key, move_functor() ));
+                    CPPUNIT_ASSERT( pq.pop_with( [&key]( value_type& src ) { key = src.k;  } ) );
                     CPPUNIT_CHECK_EX( key == nPrev - 1, "Expected=" << nPrev - 1 << ", current=" << key );
                     nPrev = key;
                 }