Fixed emplace()

[libcds.git] / tests / test-hdr / tree / hdr_ellenbintree_map_hp.cpp

diff --git a/tests/test-hdr/tree/hdr_ellenbintree_map_hp.cpp b/tests/test-hdr/tree/hdr_ellenbintree_map_hp.cpp
index 4b27b8fbec2a09eb95eccbefcbbcd7ff6ada75b3..b6a3bce2dc8578ee0a04522749b49c015262b644 100644 (file)
--- a/tests/test-hdr/tree/hdr_ellenbintree_map_hp.cpp
+++ b/tests/test-hdr/tree/hdr_ellenbintree_map_hp.cpp
@@ -1,4 +1,32 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+
+    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:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    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.     
+*/
 
 #include "tree/hdr_ellenbintree_map.h"
 #include <cds/container/ellen_bintree_map_hp.h>
@@ -12,7 +40,7 @@ namespace tree {
     namespace {
         typedef cds::gc::HP gc_type;
 
-        typedef cc::ellen_bintree::map_node<gc_type, EllenBinTreeMapHdrTest::key_type, EllenBinTreeMapHdrTest::value_type> tree_leaf_node;
+        typedef cc::ellen_bintree::map_node<gc_type, EllenBinTreeMapHdrTest::key_type, EllenBinTreeMapHdrTest::value_type>  tree_leaf_node;
         typedef cc::ellen_bintree::internal_node< EllenBinTreeMapHdrTest::key_type, tree_leaf_node >                        tree_internal_node;
         typedef cc::ellen_bintree::update_desc<tree_leaf_node, tree_internal_node>                                          tree_update_desc;
 
@@ -28,11 +56,11 @@ namespace tree {
 
     void EllenBinTreeMapHdrTest::EllenBinTree_hp_less()
     {
-        typedef cc::EllenBinTreeMap< gc_type, key_type, value_type,
-            cc::ellen_bintree::make_map_traits<
-                co::less< less >
-            >::type
-        > set_type;
+        struct set_traits : public cc::ellen_bintree::traits
+        {
+            typedef EllenBinTreeMapHdrTest::less less;
+        };
+        typedef cc::EllenBinTreeMap< gc_type, key_type, value_type, set_traits > set_type;
 
         test<set_type, print_stat>();
     }
@@ -109,6 +137,20 @@ namespace tree {
         test<set_type, print_stat>();
     }
 
+    void EllenBinTreeMapHdrTest::EllenBinTree_hp_cmp_ic_stat_yield()
+    {
+        typedef cc::EllenBinTreeMap< gc_type, key_type, value_type,
+            cc::ellen_bintree::make_map_traits<
+                co::item_counter< cds::atomicity::item_counter >
+                ,co::stat< cc::ellen_bintree::stat<> >
+                ,co::compare< compare >
+                , co::back_off< cds::backoff::yield >
+            >::type
+        > set_type;
+
+        test<set_type, print_stat>();
+    }
+
     void EllenBinTreeMapHdrTest::EllenBinTree_hp_less_pool()
     {
         typedef cc::EllenBinTreeMap< gc_type, key_type, value_type,