From: khizmax Date: Wed, 28 Sep 2016 20:15:31 +0000 (+0300) Subject: Fixed minor clang warnings X-Git-Tag: v2.2.0~107 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2b6f7d9e8397dd660c54428ac3e3fc6c0b260c24;p=libcds.git Fixed minor clang warnings --- diff --git a/test/stress/set/set_type_ellen_bintree.h b/test/stress/set/set_type_ellen_bintree.h index 54afe0b2..0d08e2d6 100644 --- a/test/stress/set/set_type_ellen_bintree.h +++ b/test/stress/set/set_type_ellen_bintree.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_SET_TYPE_ELLEN_BINTREE_H @@ -296,7 +296,7 @@ namespace set { template static inline void additional_check( EllenBinTreeSet& s ) { - typedef EllenBinTreeSet set_type; + //typedef EllenBinTreeSet set_type; GC::force_dispose(); ellen_bintree_check::check_stat( s.statistics()); /* diff --git a/test/unit/tree/intrusive_ellenbintree_dhp.cpp b/test/unit/tree/intrusive_ellenbintree_dhp.cpp index 34f54162..727c6fcf 100644 --- a/test/unit/tree/intrusive_ellenbintree_dhp.cpp +++ b/test/unit/tree/intrusive_ellenbintree_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_intrusive_tree_hp.h" @@ -50,10 +50,6 @@ namespace { void SetUp() { - struct list_traits : public ci::ellen_bintree::traits - { - typedef ci::ellen_bintree::base_hook< ci::opt::gc> hook; - }; typedef ci::EllenBinTree< gc_type, key_type, base_item_type > tree_type; cds::gc::dhp::GarbageCollector::Construct( 16, tree_type::c_nHazardPtrCount ); diff --git a/test/unit/tree/intrusive_ellenbintree_hp.cpp b/test/unit/tree/intrusive_ellenbintree_hp.cpp index 8674c618..a4bd7d56 100644 --- a/test/unit/tree/intrusive_ellenbintree_hp.cpp +++ b/test/unit/tree/intrusive_ellenbintree_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_intrusive_tree_hp.h" @@ -50,10 +50,6 @@ namespace { void SetUp() { - struct tree_traits : public ci::ellen_bintree::traits - { - typedef ci::ellen_bintree::base_hook< ci::opt::gc> hook; - }; typedef ci::EllenBinTree< gc_type, key_type, base_item_type > tree_type; // +1 - for guarded_ptr