[UBsan] Added proper alignment for EllenBinTree node

[libcds.git] / cds / intrusive / striped_set / boost_slist.h

diff --git a/cds/intrusive/striped_set/boost_slist.h b/cds/intrusive/striped_set/boost_slist.h
index 871ab5e060b13ed8307427fb1ca03451bc492a82..2d7596d8f7cfb82a65133edda321a5db4e2698c3 100644 (file)
--- a/cds/intrusive/striped_set/boost_slist.h
+++ b/cds/intrusive/striped_set/boost_slist.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-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_INTRUSIVE_STRIPED_SET_BOOST_SLIST_ADAPTER_H
 #define CDSLIB_INTRUSIVE_STRIPED_SET_BOOST_SLIST_ADAPTER_H
@@ -35,9 +63,9 @@ namespace cds { namespace intrusive { namespace striped_set {
                     iterator itPrev = m_List.before_begin();
                     iterator itEnd = m_List.end();
                     for ( iterator it = m_List.begin(); it != itEnd; ++it ) {
-                        if ( pred( key, *it ) )
+                        if ( pred( key, *it ))
                             itPrev = it;
-                        else if ( pred( *it, key ) )
+                        else if ( pred( *it, key ))
                             break;
                         else
                             return std::make_pair( itPrev, true );
@@ -48,7 +76,7 @@ namespace cds { namespace intrusive { namespace striped_set {
                 template <typename Q>
                 std::pair< iterator, bool > find_prev_item( Q const& key )
                 {
-                    return find_prev_item_cmp( key, key_comparator() );
+                    return find_prev_item_cmp( key, key_comparator());
                 }
 
                 template <typename Q, typename Compare>
@@ -111,11 +139,14 @@ namespace cds { namespace intrusive { namespace striped_set {
                 }
 
                 template <typename Func>
-                std::pair<bool, bool> ensure( value_type& val, Func f )
+                std::pair<bool, bool> update( value_type& val, Func f, bool bAllowInsert )
                 {
                     std::pair< iterator, bool > pos = find_prev_item( val );
                     if ( !pos.second ) {
                         // insert new
+                        if ( !bAllowInsert )
+                            return std::make_pair( false, false );
+
                         m_List.insert_after( pos.first, val );
                         f( true, val, val );
                         return std::make_pair( true, true );