Fixed minor clang warnings

diff --git a/test/unit/map/skiplist_dhp.cpp b/test/unit/map/skiplist_dhp.cpp
index 626ed2b4aaf0344478d7b36dada53c57143b885a..dbae7057ad6ad85fd2c5883dd5c2209d3d4f2019 100644 (file)
--- a/test/unit/map/skiplist_dhp.cpp
+++ b/test/unit/map/skiplist_dhp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
 
     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:
 
     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
     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.

 */
 
 #include "test_skiplist_hp.h"
 */
 
 #include "test_skiplist_hp.h"


@@ -43,10 +43,6 @@ namespace {
 
         void SetUp()
         {
 
         void SetUp()
         {

-            struct map_traits: public cc::skip_list::traits
-            {
-                typedef cmp compare;
-            };

             typedef cc::SkipListMap< gc_type, key_type, value_type > map_type;
 
             cds::gc::dhp::GarbageCollector::Construct( 16, map_type::c_nHazardPtrCount );
             typedef cc::SkipListMap< gc_type, key_type, value_type > map_type;
 
             cds::gc::dhp::GarbageCollector::Construct( 16, map_type::c_nHazardPtrCount );

diff --git a/test/unit/map/skiplist_hp.cpp b/test/unit/map/skiplist_hp.cpp
index 316681299c682855ddc694c010db0c4c1b8b9856..6bb262f2e03b665df15ba271badd1c939289f91d 100644 (file)
--- a/test/unit/map/skiplist_hp.cpp
+++ b/test/unit/map/skiplist_hp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
 
     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:
 
     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
     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.

 */
 
 #include "test_skiplist_hp.h"
 */
 
 #include "test_skiplist_hp.h"


@@ -43,10 +43,6 @@ namespace {
 
         void SetUp()
         {
 
         void SetUp()
         {

-            struct map_traits: public cc::skip_list::traits
-            {
-                typedef cmp compare;
-            };

             typedef cc::SkipListMap< gc_type, key_type, value_type > map_type;
 
             // +1 - for guarded_ptr
             typedef cc::SkipListMap< gc_type, key_type, value_type > map_type;
 
             // +1 - for guarded_ptr

diff --git a/test/unit/map/test_skiplist_hp.h b/test/unit/map/test_skiplist_hp.h
index 59e4d5982eaee7042e3fa92931ccd31185d1627b..9c99762b339f441c182ff480a97e4b01c27759a7 100644 (file)
--- a/test/unit/map/test_skiplist_hp.h
+++ b/test/unit/map/test_skiplist_hp.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
 
     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:
 
     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
     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_HP_H
 */
 
 #ifndef CDSUNIT_MAP_TEST_SKIPLIST_HP_H


@@ -51,7 +51,6 @@ namespace cds_test {
             ASSERT_TRUE( m.empty());
             ASSERT_CONTAINER_SIZE( m, 0 );
 
             ASSERT_TRUE( m.empty());
             ASSERT_CONTAINER_SIZE( m, 0 );
 

-            typedef typename Map::value_type map_pair;

             size_t const kkSize = base_class::kSize;
 
             std::vector<key_type> arrKeys;
             size_t const kkSize = base_class::kSize;
 
             std::vector<key_type> arrKeys;

diff --git a/test/unit/map/test_skiplist_rcu.h b/test/unit/map/test_skiplist_rcu.h
index f28682e48ef22236c3e306ff0e9246091fbf961b..6ef2234fbe6c20217d0b3ec4f0bfc7346ec6f866 100644 (file)
--- a/test/unit/map/test_skiplist_rcu.h
+++ b/test/unit/map/test_skiplist_rcu.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
 
     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:
 
     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
     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
 */
 #ifndef CDSUNIT_MAP_TEST_SKIPLIST_RCU_H
 #define CDSUNIT_MAP_TEST_SKIPLIST_RCU_H


@@ -54,7 +54,6 @@ protected:
         ASSERT_TRUE( m.empty() );
         ASSERT_CONTAINER_SIZE( m, 0 );
 
         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;
 
         typedef typename Map::exempt_ptr exempt_ptr;
         size_t const kkSize = base_class::kSize;
 

diff --git a/test/unit/tree/test_tree_map_hp.h b/test/unit/tree/test_tree_map_hp.h
index 831d0cd748c4b0e7d6fae3fe8a84dc0ee492d451..33a9cd9879a920adee9f808beff0b202e3c39a0a 100644 (file)
--- a/test/unit/tree/test_tree_map_hp.h
+++ b/test/unit/tree/test_tree_map_hp.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
 
     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:
 
     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
     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_TREE_TEST_TREE_MAP_HP_H
 */
 
 #ifndef CDSUNIT_TREE_TEST_TREE_MAP_HP_H


@@ -51,7 +51,6 @@ namespace cds_test {
             ASSERT_TRUE( m.empty());
             ASSERT_CONTAINER_SIZE( m, 0 );
 
             ASSERT_TRUE( m.empty());
             ASSERT_CONTAINER_SIZE( m, 0 );
 

-            typedef typename Map::value_type map_pair;

             size_t const kkSize = base_class::kSize;
 
             std::vector<key_type> arrKeys;
             size_t const kkSize = base_class::kSize;
 
             std::vector<key_type> arrKeys;

diff --git a/test/unit/tree/test_tree_map_rcu.h b/test/unit/tree/test_tree_map_rcu.h
index 113a25ecc01b5b7460be0420af87ed4c2cf98f8b..b358b8d4730c4c5605f4ec09f6a89656948986a2 100644 (file)
--- a/test/unit/tree/test_tree_map_rcu.h
+++ b/test/unit/tree/test_tree_map_rcu.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
 
     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:
 
     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
     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_TREE_TEST_TREE_MAP_RCU_H
 */
 
 #ifndef CDSUNIT_TREE_TEST_TREE_MAP_RCU_H


@@ -51,7 +51,6 @@ namespace cds_test {
             ASSERT_TRUE( m.empty());
             ASSERT_CONTAINER_SIZE( m, 0 );
 
             ASSERT_TRUE( m.empty());
             ASSERT_CONTAINER_SIZE( m, 0 );
 

-            typedef typename Map::value_type map_pair;

             size_t const kkSize = base_class::kSize;
 
             std::vector<key_type> arrKeys;
             size_t const kkSize = base_class::kSize;
 
             std::vector<key_type> arrKeys;