From 0da77b395c851b8752a8d9ec39eaa4e1a4848a19 Mon Sep 17 00:00:00 2001 From: khizmax Date: Fri, 14 Nov 2014 15:54:44 +0300 Subject: [PATCH] fix priority queue unit tests --- tests/unit/pqueue/ellen_bintree_pqueue.h | 14 ++++++-------- tests/unit/pqueue/skiplist_pqueue.h | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/tests/unit/pqueue/ellen_bintree_pqueue.h b/tests/unit/pqueue/ellen_bintree_pqueue.h index 8be18c7e..0eb71a91 100644 --- a/tests/unit/pqueue/ellen_bintree_pqueue.h +++ b/tests/unit/pqueue/ellen_bintree_pqueue.h @@ -34,11 +34,10 @@ namespace pqueue { template bool operator()( T& dest, Tree& container ) const { - typename Tree::exempt_ptr ep; - bool bRet = container.extract_max( ep ); - if ( bRet ) + typename Tree::exempt_ptr ep( container.extract_max()); + if ( ep ) dest = *ep; - return bRet; + return !ep.empty(); } }; @@ -62,11 +61,10 @@ namespace pqueue { template bool operator()( T& dest, Tree& container ) const { - typename Tree::exempt_ptr ep; - bool bRet = container.extract_min( ep ); - if ( bRet ) + typename Tree::exempt_ptr ep( container.extract_min()); + if ( ep ) dest = *ep; - return bRet; + return !ep.empty(); } }; diff --git a/tests/unit/pqueue/skiplist_pqueue.h b/tests/unit/pqueue/skiplist_pqueue.h index 68a816e9..92ef9df0 100644 --- a/tests/unit/pqueue/skiplist_pqueue.h +++ b/tests/unit/pqueue/skiplist_pqueue.h @@ -34,11 +34,10 @@ namespace pqueue { template bool operator()( T& dest, Set& container ) const { - typename Set::exempt_ptr ep; - bool bRet = container.extract_max( ep ); - if ( bRet ) + typename Set::exempt_ptr ep( container.extract_max()); + if ( ep ) dest = *ep; - return bRet; + return !ep.empty(); } }; @@ -62,11 +61,10 @@ namespace pqueue { template bool operator()( T& dest, Set& container ) const { - typename Set::exempt_ptr ep; - bool bRet = container.extract_min( ep ); - if ( bRet ) + typename Set::exempt_ptr ep( container.extract_min()); + if ( ep ) dest = *ep; - return bRet; + return !ep.empty(); } }; -- 2.34.1