Removed redundant spaces

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

diff --git a/cds/container/striped_set/std_set.h b/cds/container/striped_set/std_set.h
index a132aaee9071b2117613ee9da6dd54da061d77b6..95ace96fbde698d2db956cba372d5adbdc7e30cd 100644 (file)
--- a/cds/container/striped_set/std_set.h
+++ b/cds/container/striped_set/std_set.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 CDSLIB_CONTAINER_STRIPED_SET_STD_SET_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_SET_STD_SET_ADAPTER_H
@@ -36,7 +64,7 @@ namespace cds { namespace container {
 
             void operator()( set_type& set, iterator itWhat )
             {
-                set.insert( std::move( *itWhat ) );
+                set.insert( std::move( *itWhat ));
             }
         };
     }   // namespace striped_set
@@ -88,9 +116,9 @@ namespace cds { namespace intrusive { namespace striped_set {
             template <typename Q, typename Func>
             bool insert( const Q& val, Func f )
             {
-                std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
+                std::pair<iterator, bool> res = m_Set.insert( value_type(val));
                 if ( res.second )
-                    f( const_cast<value_type&>(*res.first) );
+                    f( const_cast<value_type&>(*res.first));
                 return res.second;
             }
 
@@ -102,20 +130,29 @@ namespace cds { namespace intrusive { namespace striped_set {
             }
 
             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 )
             {
-                std::pair<iterator, bool> res = m_Set.insert( value_type(val) );
-                func( res.second, const_cast<value_type&>(*res.first), val );
-                return std::make_pair( true, res.second );
+                if ( bAllowInsert ) {
+                    std::pair<iterator, bool> res = m_Set.insert( value_type(val));
+                    func( res.second, const_cast<value_type&>(*res.first), val );
+                    return std::make_pair( true, res.second );
+                }
+                else {
+                    auto it = m_Set.find(value_type(val));
+                    if ( it == m_Set.end())
+                        return std::make_pair( false, false );
+                    func( false, const_cast<value_type&>(*it), val );
+                    return std::make_pair( true, false );
+                }
             }
 
             template <typename Q, typename Func>
             bool erase( const Q& key, Func f )
             {
-                iterator it = m_Set.find( value_type(key) );
-                if ( it == m_Set.end() )
+                iterator it = m_Set.find( value_type(key));
+                if ( it == m_Set.end())
                     return false;
-                f( const_cast<value_type&>(*it) );
+                f( const_cast<value_type&>(*it));
                 m_Set.erase( it );
                 return true;
             }
@@ -123,8 +160,8 @@ namespace cds { namespace intrusive { namespace striped_set {
             template <typename Q, typename Func>
             bool find( Q& val, Func f )
             {
-                iterator it = m_Set.find( value_type(val) );
-                if ( it == m_Set.end() )
+                iterator it = m_Set.find( value_type(val));
+                if ( it == m_Set.end())
                     return false;
                 f( const_cast<value_type&>(*it), val );
                 return true;
@@ -142,7 +179,7 @@ namespace cds { namespace intrusive { namespace striped_set {
 
             void move_item( adapted_container& /*from*/, iterator itWhat )
             {
-                assert( m_Set.find( *itWhat ) == m_Set.end() );
+                assert( m_Set.find( *itWhat ) == m_Set.end());
                 copy_item()( m_Set, itWhat );
             }