Updated copyright

[libcds.git] / cds / container / striped_map / std_map.h

diff --git a/cds/container/striped_map/std_map.h b/cds/container/striped_map/std_map.h
index 6214b588d2bc2029af28754d6b840c9efc753ced..eaebeacbc8f828f984570c823efab0791496d9c1 100644 (file)
--- a/cds/container/striped_map/std_map.h
+++ b/cds/container/striped_map/std_map.h
@@ -1,7 +1,35 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_CONTAINER_STRIPED_MAP_STD_MAP_ADAPTER_H
-#define __CDS_CONTAINER_STRIPED_MAP_STD_MAP_ADAPTER_H
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
+
+    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 CDSLIB_CONTAINER_STRIPED_MAP_STD_MAP_ADAPTER_H
+#define CDSLIB_CONTAINER_STRIPED_MAP_STD_MAP_ADAPTER_H
 
 #include <cds/container/striped_set/adapter.h>
 #include <map>
@@ -34,7 +62,7 @@ namespace cds { namespace container {
 
             void operator()( map_type& map, iterator itWhat )
             {
-                std::pair< typename map_type::iterator, bool > ret = map.insert( pair_type( itWhat->first, typename pair_type::second_type() ));
+                std::pair< typename map_type::iterator, bool > ret = map.insert( pair_type( itWhat->first, typename pair_type::second_type()));
                 assert( ret.second )    ;   // successful insertion
                 std::swap( ret.first->second, itWhat->second );
             }
@@ -50,7 +78,7 @@ namespace cds { namespace container {
 
             void operator()( map_type& map, iterator itWhat  )
             {
-                map.insert( std::move( *itWhat ) );
+                map.insert( std::move( *itWhat ));
             }
         };
     }   // namespace striped_set
@@ -104,32 +132,41 @@ namespace cds { namespace intrusive { namespace striped_set {
             template <typename Q, typename Func>
             bool insert( const Q& key, Func f )
             {
-                std::pair<iterator, bool> res = m_Map.insert( value_type( key, mapped_type() ) );
+                std::pair<iterator, bool> res = m_Map.insert( value_type( key_type( key ), mapped_type()));
                 if ( res.second )
-                    ::f( *res.first );
+                    f( *res.first );
                 return res.second;
             }
 
             template <typename Q, typename... Args>
             bool emplace( Q&& key, Args&&... args )
             {
-                std::pair<iterator, bool> res = m_Map.emplace( std::forward<Q>(key), std::move(mapped_type( std::forward<Args>(args)...)));
+                std::pair<iterator, bool> res = m_Map.emplace( key_type( std::forward<Q>( key )), mapped_type( std::forward<Args>( args )...));
                 return res.second;
             }
 
             template <typename Q, typename Func>
-            std::pair<bool, bool> ensure( const Q& key, Func func )
+            std::pair<bool, bool> update( const Q& key, Func func, bool bAllowInsert )
             {
-                std::pair<iterator, bool> res = m_Map.insert( value_type( key, mapped_type() ));
-                func( res.second, *res.first );
-                return std::make_pair( true, res.second );
+                if ( bAllowInsert ) {
+                    std::pair<iterator, bool> res = m_Map.insert( value_type( key_type( key ), mapped_type()));
+                    func( res.second, *res.first );
+                    return std::make_pair( true, res.second );
+                }
+                else {
+                    auto it = m_Map.find( key_type( key ));
+                    if ( it == end())
+                        return std::make_pair( false, false );
+                    func( false, *it );
+                    return std::make_pair( true, false );
+                }
             }
 
             template <typename Q, typename Func>
             bool erase( const Q& key, Func f )
             {
-                iterator it = m_Map.find( key_type(key) );
-                if ( it == m_Map.end() )
+                iterator it = m_Map.find( key_type( key ));
+                if ( it == m_Map.end())
                     return false;
                 f( *it );
                 m_Map.erase( it );
@@ -137,12 +174,12 @@ namespace cds { namespace intrusive { namespace striped_set {
             }
 
             template <typename Q, typename Func>
-            bool find( Q& val, Func f )
+            bool find( Q& key, Func f )
             {
-                iterator it = m_Map.find( key_type(val) );
-                if ( it == m_Map.end() )
+                iterator it = m_Map.find( key_type( key ));
+                if ( it == m_Map.end())
                     return false;
-                f( *it, val );
+                f( *it, key );
                 return true;
             }
 
@@ -159,7 +196,7 @@ namespace cds { namespace intrusive { namespace striped_set {
 
             void move_item( adapted_container& /*from*/, iterator itWhat )
             {
-                assert( m_Map.find( itWhat->first ) == m_Map.end() );
+                assert( m_Map.find( itWhat->first ) == m_Map.end());
                 copy_item()( m_Map, itWhat );
             }
 
@@ -176,4 +213,4 @@ namespace cds { namespace intrusive { namespace striped_set {
 
 //@endcond
 
-#endif // #ifndef __CDS_CONTAINER_STRIPED_MAP_STD_MAP_ADAPTER_H
+#endif // #ifndef CDSLIB_CONTAINER_STRIPED_MAP_STD_MAP_ADAPTER_H