Merged branch 'master' of https://github.com/Nemo1369/libcds

[libcds.git] / test / unit / map / test_skiplist_rcu.h

diff --git a/test/unit/map/test_skiplist_rcu.h b/test/unit/map/test_skiplist_rcu.h
index ea0d3edb40ece4ad9bcb1d93bd2512b019213712..61a44cd9342d33cf479e031ec0e4b86ec3ddf9c1 100644 (file)
--- a/test/unit/map/test_skiplist_rcu.h
+++ b/test/unit/map/test_skiplist_rcu.h
@@ -1,11 +1,11 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,7 +25,7 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef CDSUNIT_MAP_TEST_SKIPLIST_RCU_H
 #define CDSUNIT_MAP_TEST_SKIPLIST_RCU_H
@@ -51,10 +51,9 @@ protected:
 
         base_class::test( m );
 
-        ASSERT_TRUE( m.empty() );
+        ASSERT_TRUE( m.empty());
         ASSERT_CONTAINER_SIZE( m, 0 );
 
-        typedef typename Map::value_type map_pair;
         typedef typename Map::exempt_ptr exempt_ptr;
         size_t const kkSize = base_class::kSize;
 
@@ -66,7 +65,7 @@ protected:
 
         size_t nCount = 0;
         int nKey = 0;
-        while ( !m.empty() ) {
+        while ( !m.empty()) {
             xp = m.extract_min();
             ASSERT_FALSE( !xp );
             EXPECT_EQ( xp->first.nKey, nKey + 1 );
@@ -78,7 +77,7 @@ protected:
         xp = m.extract_max();
         ASSERT_TRUE( !xp );
         EXPECT_EQ( kkSize, nCount );
-        ASSERT_TRUE( m.empty() );
+        ASSERT_TRUE( m.empty());
         ASSERT_CONTAINER_SIZE( m, 0 );
 
         // get_max
@@ -87,7 +86,7 @@ protected:
 
         nKey = kkSize;
         nCount = 0;
-        while ( !m.empty() ) {
+        while ( !m.empty()) {
             xp = m.extract_max();
             ASSERT_FALSE( !xp );
             EXPECT_EQ( xp->first.nKey, nKey - 1 );
@@ -99,7 +98,7 @@ protected:
         xp = m.extract_max();
         ASSERT_TRUE( !xp );
         EXPECT_EQ( kkSize, nCount );
-        ASSERT_TRUE( m.empty() );
+        ASSERT_TRUE( m.empty());
         ASSERT_CONTAINER_SIZE( m, 0 );
     }
 
@@ -252,4 +251,4 @@ REGISTER_TYPED_TEST_CASE_P( SkipListMap,
 
 
 #endif // CDSUNIT_MAP_TEST_SKIPLIST_RCU_H
- 
\ No newline at end of file
+