Merge pull request #58 from rfw/patch-1

[libcds.git] / tests / unit / map2 / std_hash_map.h

diff --git a/tests/unit/map2/std_hash_map.h b/tests/unit/map2/std_hash_map.h
index 067e69f83af57747a7a5b8e2af2fa4438015cb34..837b0e496bb064922c15e40c9febaa2fac501751 100644 (file)
--- a/tests/unit/map2/std_hash_map.h
+++ b/tests/unit/map2/std_hash_map.h
@@ -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.     
+*/
 
 #ifndef CDSUNIT_STD_HASH_MAP_GCC_H
 #define CDSUNIT_STD_HASH_MAP_GCC_H
@@ -32,10 +60,14 @@ namespace map2 {
         typedef typename base_class::mapped_type value_type;
         typedef size_t      item_counter;
 
-        StdHashMap( size_t /*nMapSize*/, size_t /*nLoadFactor*/ )
+        StdHashMap()
         {}
 
-        bool find( const Key& key )
+        template <class Config>
+        StdHashMap( Config const& )
+        {}
+
+        bool contains( const Key& key )
         {
             scoped_lock al( m_lock );
             return base_class::find( key ) != base_class::end();
@@ -60,7 +92,7 @@ namespace map2 {
         }
 
         template <typename T, typename Func>
-        std::pair<bool, bool> ensure( const T& key, Func func )
+        std::pair<bool, bool> update( const T& key, Func func, bool /*bAllowInsert*/ = true )
         {
             scoped_lock al( m_lock );
             std::pair<typename base_class::iterator, bool> pRet = base_class::insert( typename base_class::value_type( key, Value() ));
@@ -93,6 +125,12 @@ namespace map2 {
         }
 
         std::ostream& dump( std::ostream& stm ) { return stm; }
+
+
+        // for testing
+        static CDS_CONSTEXPR bool const c_bExtractSupported = false;
+        static CDS_CONSTEXPR bool const c_bLoadFactorDepended = false;
+        static CDS_CONSTEXPR bool const c_bEraseExactKey = false;
     };
 }   // namespace map2