From: khizmax Date: Wed, 28 Sep 2016 19:54:49 +0000 (+0300) Subject: Fixed minor clang warnings X-Git-Tag: v2.2.0~109 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d78ee2a92e478b868743de21de7d94a873fc76cf;p=libcds.git Fixed minor clang warnings --- diff --git a/test/unit/map/skiplist_dhp.cpp b/test/unit/map/skiplist_dhp.cpp index 626ed2b4..dbae7057 100644 --- 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/ - + 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. */ #include "test_skiplist_hp.h" @@ -43,10 +43,6 @@ namespace { 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 ); diff --git a/test/unit/map/skiplist_hp.cpp b/test/unit/map/skiplist_hp.cpp index 31668129..6bb262f2 100644 --- 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/ - + 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. */ #include "test_skiplist_hp.h" @@ -43,10 +43,6 @@ namespace { 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 diff --git a/test/unit/map/test_skiplist_hp.h b/test/unit/map/test_skiplist_hp.h index 59e4d598..9c99762b 100644 --- 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/ - + 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_HP_H @@ -51,7 +51,6 @@ namespace cds_test { 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 arrKeys; diff --git a/test/unit/map/test_skiplist_rcu.h b/test/unit/map/test_skiplist_rcu.h index f28682e4..6ef2234f 100644 --- 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/ - + 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 @@ -54,7 +54,6 @@ protected: 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; diff --git a/test/unit/tree/test_tree_map_hp.h b/test/unit/tree/test_tree_map_hp.h index 831d0cd7..33a9cd98 100644 --- 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/ - + 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_TREE_TEST_TREE_MAP_HP_H @@ -51,7 +51,6 @@ namespace cds_test { 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 arrKeys; diff --git a/test/unit/tree/test_tree_map_rcu.h b/test/unit/tree/test_tree_map_rcu.h index 113a25ec..b358b8d4 100644 --- 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/ - + 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_TREE_TEST_TREE_MAP_RCU_H @@ -51,7 +51,6 @@ namespace cds_test { 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 arrKeys;