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

[libcds.git] / test / unit / misc / bitop.cpp

diff --git a/test/unit/misc/bitop.cpp b/test/unit/misc/bitop.cpp
index 54670dc001aba67e8fe49df4241d03f1424adb99..34b7fed1f828b09f49933dcd084a3a0202e12ff9 100644 (file)
--- a/test/unit/misc/bitop.cpp
+++ b/test/unit/misc/bitop.cpp
@@ -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:
 
@@ -44,7 +44,7 @@ namespace {
         EXPECT_EQ( cds::bitop::MSB(n), 0 ) << "n=" << n;
         EXPECT_EQ( cds::bitop::LSB( n ), 0 ) << "n=" << n;
         EXPECT_EQ( cds::bitop::SBC( n ), 0 ) << "n=" << n;
-        EXPECT_EQ( cds::bitop::ZBC( n ), sizeof( n ) * 8 ) << "n=" << n;
+        EXPECT_EQ( cds::bitop::ZBC( n ), static_cast<int>( sizeof( n ) * 8 )) << "n=" << n;
 
         int nBit = 1;
         for ( n = 1; n != 0; n *= 2 ) {
@@ -53,7 +53,7 @@ namespace {
             EXPECT_EQ( cds::bitop::MSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::LSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::SBC( n ), 1 ) << "n=" << n;
-            EXPECT_EQ( cds::bitop::ZBC( n ), sizeof( n ) * 8  - 1 ) << "n=" << n;
+            EXPECT_EQ( cds::bitop::ZBC( n ), static_cast<int>( sizeof( n ) * 8 - 1 )) << "n=" << n;
 
             ++nBit;
         }
@@ -66,7 +66,7 @@ namespace {
         EXPECT_EQ( cds::bitop::MSB( n ), 0 ) << "n=" << n;
         EXPECT_EQ( cds::bitop::LSB( n ), 0 ) << "n=" << n;
         EXPECT_EQ( cds::bitop::SBC( n ), 0 ) << "n=" << n;
-        EXPECT_EQ( cds::bitop::ZBC( n ), sizeof( n ) * 8 ) << "n=" << n;
+        EXPECT_EQ( cds::bitop::ZBC( n ), static_cast<int>( sizeof( n ) * 8 )) << "n=" << n;
 
         int nBit = 1;
         for ( n = 1; n != 0; n *= 2 ) {
@@ -75,7 +75,7 @@ namespace {
             EXPECT_EQ( cds::bitop::MSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::LSBnz( n ), nBit - 1 ) << "n=" << n;
             EXPECT_EQ( cds::bitop::SBC( n ), 1 ) << "n=" << n;
-            EXPECT_EQ( cds::bitop::ZBC( n ), sizeof( n ) * 8 - 1 ) << "n=" << n;
+            EXPECT_EQ( cds::bitop::ZBC( n ), static_cast<int>( sizeof( n ) * 8 - 1 )) << "n=" << n;
 
             ++nBit;
         }
@@ -83,15 +83,15 @@ namespace {
 
     TEST_F( bitop, floor_pow2 )
     {
-        EXPECT_EQ( cds::beans::floor2( 0 ), 1 );
-        EXPECT_EQ( cds::beans::floor2( 1 ), 1 );
-        EXPECT_EQ( cds::beans::floor2( 2 ), 2 );
-        EXPECT_EQ( cds::beans::floor2( 3 ), 2 );
-        EXPECT_EQ( cds::beans::floor2( 4 ), 4 );
-        EXPECT_EQ( cds::beans::floor2( 5 ), 4 );
-        EXPECT_EQ( cds::beans::floor2( 7 ), 4 );
-        EXPECT_EQ( cds::beans::floor2( 8 ), 8 );
-        EXPECT_EQ( cds::beans::floor2( 9 ), 8 );
+        EXPECT_EQ( cds::beans::floor2( 0u ), 1u );
+        EXPECT_EQ( cds::beans::floor2( 1u ), 1u );
+        EXPECT_EQ( cds::beans::floor2( 2u ), 2u );
+        EXPECT_EQ( cds::beans::floor2( 3u ), 2u );
+        EXPECT_EQ( cds::beans::floor2( 4u ), 4u );
+        EXPECT_EQ( cds::beans::floor2( 5u ), 4u );
+        EXPECT_EQ( cds::beans::floor2( 7u ), 4u );
+        EXPECT_EQ( cds::beans::floor2( 8u ), 8u );
+        EXPECT_EQ( cds::beans::floor2( 9u ), 8u );
 
         for ( uint32_t n = 2; n; n <<= 1 )
         {
@@ -109,15 +109,15 @@ namespace {
 
     TEST_F( bitop, ceil_pow2 )
     {
-        EXPECT_EQ( cds::beans::ceil2( 0 ), 1 );
-        EXPECT_EQ( cds::beans::ceil2( 1 ), 1 );
-        EXPECT_EQ( cds::beans::ceil2( 2 ), 2 );
-        EXPECT_EQ( cds::beans::ceil2( 3 ), 4 );
-        EXPECT_EQ( cds::beans::ceil2( 4 ), 4 );
-        EXPECT_EQ( cds::beans::ceil2( 5 ), 8 );
-        EXPECT_EQ( cds::beans::ceil2( 7 ), 8 );
-        EXPECT_EQ( cds::beans::ceil2( 8 ), 8 );
-        EXPECT_EQ( cds::beans::ceil2( 9 ), 16 );
+        EXPECT_EQ( cds::beans::ceil2( 0u ), 1u );
+        EXPECT_EQ( cds::beans::ceil2( 1u ), 1u );
+        EXPECT_EQ( cds::beans::ceil2( 2u ), 2u );
+        EXPECT_EQ( cds::beans::ceil2( 3u ), 4u );
+        EXPECT_EQ( cds::beans::ceil2( 4u ), 4u );
+        EXPECT_EQ( cds::beans::ceil2( 5u ), 8u );
+        EXPECT_EQ( cds::beans::ceil2( 7u ), 8u );
+        EXPECT_EQ( cds::beans::ceil2( 8u ), 8u );
+        EXPECT_EQ( cds::beans::ceil2( 9u ), 16u );
 
         for ( uint32_t n = 4; n < (uint32_t(1) << 31); n <<= 1 )
         {