Merge remote-tracking branch 'khizmax/master'

[libcds.git] / cds / container / striped_set / std_vector.h

diff --git a/cds/container/striped_set/std_vector.h b/cds/container/striped_set/std_vector.h
index 1e19993b6cb1110a69bc525d4b6cb61f190956e3..ce4b271cb41e5a4531301f2509b80cdce902c0c0 100644 (file)
--- a/cds/container/striped_set/std_vector.h
+++ b/cds/container/striped_set/std_vector.h
@@ -1,7 +1,35 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_CONTAINER_STRIPED_SET_STD_VECTOR_ADAPTER_H
-#define __CDS_CONTAINER_STRIPED_SET_STD_VECTOR_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_SET_STD_VECTOR_ADAPTER_H
+#define CDSLIB_CONTAINER_STRIPED_SET_STD_VECTOR_ADAPTER_H
 
 #include <functional>   // ref
 #include <vector>
@@ -125,7 +153,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             template <typename Q, typename Func>
             bool insert( const Q& val, Func f )
             {
-                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, find_predicate() );
+                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, find_predicate());
                 if ( it == m_Vector.end() || key_comparator()( val, *it ) != 0 ) {
                     value_type newItem( val );
                     it = m_Vector.insert( it, newItem );
@@ -145,20 +173,23 @@ namespace cds { namespace intrusive { namespace striped_set {
 #else
                 value_type val( std::forward<Args>(args)... );
 #endif
-                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, find_predicate() );
+                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, find_predicate());
                 if ( it == m_Vector.end() || key_comparator()( val, *it ) != 0 ) {
-                    it = m_Vector.emplace( it, std::move( val ) );
+                    it = m_Vector.emplace( it, std::move( val ));
                     return true;
                 }
                 return false;
             }
 
             template <typename Q, typename Func>
-            std::pair<bool, bool> ensure( const Q& val, Func func )
+            std::pair<bool, bool> update( const Q& val, Func func, bool bAllowInsert )
             {
-                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, find_predicate() );
+                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, find_predicate());
                 if ( it == m_Vector.end() || key_comparator()( val, *it ) != 0 ) {
                     // insert new
+                    if ( !bAllowInsert )
+                        return std::make_pair( false, false );
+
                     value_type newItem( val );
                     it = m_Vector.insert( it, newItem );
                     func( true, *it, val );
@@ -174,7 +205,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             template <typename Q, typename Func>
             bool erase( const Q& key, Func f )
             {
-                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), key, find_predicate() );
+                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), key, find_predicate());
                 if ( it == m_Vector.end() || key_comparator()( key, *it ) != 0 )
                     return false;
 
@@ -188,7 +219,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             bool erase( const Q& key, Less pred, Func f )
             {
                 iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), key, pred );
-                if ( it == m_Vector.end() || pred( key, *it ) || pred( *it, key ) )
+                if ( it == m_Vector.end() || pred( key, *it ) || pred( *it, key ))
                     return false;
 
                 // key exists
@@ -200,7 +231,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             template <typename Q, typename Func>
             bool find( Q& val, Func f )
             {
-                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, find_predicate() );
+                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, find_predicate());
                 if ( it == m_Vector.end() || key_comparator()( val, *it ) != 0 )
                     return false;
 
@@ -213,7 +244,7 @@ namespace cds { namespace intrusive { namespace striped_set {
             bool find( Q& val, Less pred, Func f )
             {
                 iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), val, pred );
-                if ( it == m_Vector.end() || pred( val, *it ) || pred( *it, val ) )
+                if ( it == m_Vector.end() || pred( val, *it ) || pred( *it, val ))
                     return false;
 
                 // key exists
@@ -234,7 +265,7 @@ namespace cds { namespace intrusive { namespace striped_set {
 
             void move_item( adapted_container& /*from*/, iterator itWhat )
             {
-                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), *itWhat, find_predicate() );
+                iterator it = std::lower_bound( m_Vector.begin(), m_Vector.end(), *itWhat, find_predicate());
                 assert( it == m_Vector.end() || key_comparator()( *itWhat, *it ) != 0 );
 
                 copy_item()( m_Vector, it, itWhat );
@@ -254,4 +285,4 @@ namespace cds { namespace intrusive { namespace striped_set {
 
 //@endcond
 
-#endif // #ifndef __CDS_CONTAINER_STRIPED_SET_STD_VECTOR_ADAPTER_H
+#endif // #ifndef CDSLIB_CONTAINER_STRIPED_SET_STD_VECTOR_ADAPTER_H