-//$$CDS-header$$
+/*
+ This file is a part of libcds - Concurrent Data Structures library
-#ifndef __CDS_CONTAINER_STRIPED_SET_BOOST_SLIST_ADAPTER_H
-#define __CDS_CONTAINER_STRIPED_SET_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_SET_BOOST_SLIST_ADAPTER_H
+#define CDSLIB_CONTAINER_STRIPED_SET_BOOST_SLIST_ADAPTER_H
+
+#include <functional> // ref
#include <cds/container/striped_set/adapter.h>
-#include <cds/ref.h>
#include <boost/container/slist.hpp>
//@cond
}
};
-#ifdef CDS_MOVE_SEMANTICS_SUPPORT
// Move policy for boost::container::slist
template <typename T, typename Alloc>
struct move_item_policy< boost::container::slist< T, Alloc > >
void operator()( list_type& list, iterator itInsert, iterator itWhat )
{
- list.insert_after( itInsert, std::move( *itWhat ) );
+ list.insert_after( itInsert, std::move( *itWhat ));
}
};
-#endif
} // namespace striped_set
}} // namespace cds::container
namespace cds { namespace intrusive { namespace striped_set {
/// boost::container::slist adapter for hash set bucket
- template <typename T, class Alloc, CDS_SPEC_OPTIONS>
- class adapt< boost::container::slist<T, Alloc>, CDS_OPTIONS >
+ template <typename T, class Alloc, typename... Options>
+ class adapt< boost::container::slist<T, Alloc>, Options... >
{
public:
typedef boost::container::slist<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>
, cds::container::striped_set::swap_item, cds::container::striped_set::swap_item_policy<container_type>
-#ifdef CDS_MOVE_SEMANTICS_SUPPORT
, cds::container::striped_set::move_item, cds::container::striped_set::move_item_policy<container_type>
-#endif
>::type copy_item;
template <typename Q>
for ( iterator it = m_List.begin(); it != itEnd; ++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 );
if ( !pos.second ) {
value_type newItem( val );
pos.first = m_List.insert_after( pos.first, newItem );
- cds::unref( f )( *pos.first );
+ f( *pos.first );
return true;
}
return false;
}
-# ifdef CDS_EMPLACE_SUPPORT
template <typename... Args>
bool emplace( Args&&... args )
{
value_type val( std::forward<Args>(args)... );
std::pair< iterator, bool > pos = find_prev_item( val );
if ( !pos.second ) {
- m_List.emplace_after( pos.first, std::move( val ) );
+ m_List.emplace_after( pos.first, std::move( val ));
return true;
}
return false;
}
-# endif
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 > pos = find_prev_item( val );
if ( !pos.second ) {
// insert new
+ if ( !bAllowInsert )
+ return std::make_pair( false, false );
+
value_type newItem( val );
pos.first = m_List.insert_after( pos.first, newItem );
- cds::unref( func )( true, *pos.first, val );
+ func( true, *pos.first, val );
return std::make_pair( true, true );
}
else {
// already exists
- cds::unref( func )( false, *(++pos.first), val );
+ func( false, *(++pos.first), val );
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_SET_BOOST_SLIST_ADAPTER_H
+#endif // #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_SLIST_ADAPTER_H
projects / libcds.git / blobdiff