-//$$CDS-header$$
+/*
+ This file is a part of libcds - Concurrent Data Structures library
-#ifndef __CDS_CONTAINER_STRIPED_MAP_BOOST_SLIST_ADAPTER_H
-#define __CDS_CONTAINER_STRIPED_MAP_BOOST_SLIST_ADAPTER_H
+ (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_MAP_BOOST_SLIST_ADAPTER_H
+#define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_SLIST_ADAPTER_H
#include <boost/version.hpp>
#if BOOST_VERSION < 104800
# error "For boost::container::slist you must use boost 1.48 or above"
#endif
+#include <functional> // ref
+#include <utility> // std::pair
#include <cds/container/striped_set/adapter.h>
-#include <cds/ref.h>
#include <boost/container/slist.hpp>
-#include <utility> // std::pair
//@cond
namespace cds { namespace container {
void operator()( list_type& list, iterator itInsert, iterator itWhat )
{
- pair_type newVal( itWhat->first, typename pair_type::mapped_type() );
+ pair_type newVal( itWhat->first, typename pair_type::mapped_type());
itInsert = list.insert_after( itInsert, newVal );
std::swap( itInsert->second, itWhat->second );
}
void operator()( list_type& list, iterator itInsert, iterator itWhat )
{
- list.insert_after( itInsert, std::move( *itWhat ) );
+ list.insert_after( itInsert, std::move( *itWhat ));
}
};
} // namespace striped_set
namespace cds { namespace intrusive { namespace striped_set {
/// boost::container::slist adapter for hash map bucket
- template <typename Key, typename T, class Alloc, CDS_SPEC_OPTIONS>
- class adapt< boost::container::slist< std::pair<Key const, T>, Alloc>, CDS_OPTIONS >
+ template <typename Key, typename T, class Alloc, typename... Options>
+ class adapt< boost::container::slist< std::pair<Key const, T>, Alloc>, Options... >
{
public:
typedef boost::container::slist< std::pair<Key const, T>, Alloc> container_type ; ///< underlying container type
private:
//@cond
- typedef typename cds::opt::details::make_comparator_from_option_list< value_type, CDS_OPTIONS >::type key_comparator;
+ typedef typename cds::opt::details::make_comparator_from_option_list< value_type, Options... >::type key_comparator;
typedef typename cds::opt::select<
typename cds::opt::value<
typename cds::opt::find_option<
cds::opt::copy_policy< cds::container::striped_set::move_item >
- , CDS_OPTIONS
+ , Options...
>::type
>::copy_policy
, cds::container::striped_set::copy_item, cds::container::striped_set::copy_item_policy<container_type>
{
std::pair< iterator, bool > pos = find_prev_item( key );
if ( !pos.second ) {
- value_type newItem( key, mapped_type() );
- pos.first = m_List.insert_after( pos.first, newItem );
- cds::unref( f )( *pos.first );
+ pos.first = m_List.insert_after( pos.first, value_type( key_type( key ), mapped_type()));
+ f( *pos.first );
return true;
}
{
std::pair< iterator, bool > pos = find_prev_item( key );
if ( !pos.second ) {
- m_List.emplace_after( pos.first, std::forward<K>(key), std::move( mapped_type( std::forward<Args>(args)... )));
+ m_List.emplace_after( pos.first, key_type( std::forward<K>( key )), mapped_type( std::forward<Args>( args )... ));
return true;
}
return false;
}
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 > pos = find_prev_item( key );
if ( !pos.second ) {
// insert new
- value_type newItem( key, mapped_type() );
- pos.first = m_List.insert_after( pos.first, newItem );
- cds::unref( func )( true, *pos.first );
+ if ( !bAllowInsert )
+ return std::make_pair( false, false );
+
+ pos.first = m_List.insert_after( pos.first, value_type( key_type( key ), mapped_type()));
+ func( true, *pos.first );
return std::make_pair( true, true );
}
else {
// already exists
- cds::unref( func )( false, *(++pos.first) );
+ func( false, *(++pos.first));
return std::make_pair( true, false );
}
}
// key exists
iterator it = pos.first;
- cds::unref( f )( *(++it) );
+ f( *(++it));
m_List.erase_after( pos.first );
return true;
// key exists
iterator it = pos.first;
- cds::unref( f )( *(++it) );
+ f( *(++it));
m_List.erase_after( pos.first );
return true;
return false;
// key exists
- cds::unref( f )( *(++pos.first), val );
+ f( *(++pos.first), val );
return true;
}
return false;
// key exists
- cds::unref( f )( *(++pos.first), val );
+ f( *(++pos.first), val );
return true;
}
//@endcond
-#endif // #ifndef __CDS_CONTAINER_STRIPED_MAP_BOOST_SLIST_ADAPTER_H
+#endif // #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_SLIST_ADAPTER_H
projects / libcds.git / blobdiff