//$$CDS-header$$
-#ifndef __CDS_CONTAINER_STRIPED_MAP_BOOST_LIST_ADAPTER_H
-#define __CDS_CONTAINER_STRIPED_MAP_BOOST_LIST_ADAPTER_H
+#ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_LIST_ADAPTER_H
+#define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_LIST_ADAPTER_H
#include <boost/version.hpp>
#if BOOST_VERSION < 104800
# error "For boost::container::list you must use boost 1.48 or above"
#endif
-#include <cds/container/striped_set/adapter.h>
-#include <cds/ref.h>
-#include <boost/container/list.hpp>
+#include <functional> // ref
#include <algorithm> // std::lower_bound
#include <utility> // std::pair
+#include <cds/container/striped_set/adapter.h>
+#include <boost/container/list.hpp>
//@cond
namespace cds { namespace container {
namespace cds { namespace intrusive { namespace striped_set {
/// boost::container::list adapter for hash map bucket
- template <typename Key, typename T, class Alloc, CDS_SPEC_OPTIONS>
- class adapt< boost::container::list< std::pair<Key const, T>, Alloc>, CDS_OPTIONS >
+ template <typename Key, typename T, class Alloc, typename... Options>
+ class adapt< boost::container::list< std::pair<Key const, T>, Alloc>, Options... >
{
public:
typedef boost::container::list< 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>
if ( it == m_List.end() || key_comparator()( key, it->first ) != 0 ) {
//value_type newItem( key );
it = m_List.insert( it, value_type( key, mapped_type()) );
- cds::unref( f )( *it );
+ f( *it );
return true;
}
return false;
}
-# ifdef CDS_EMPLACE_SUPPORT
template <typename K, typename... Args>
bool emplace( K&& key, Args&&... args )
{
}
return false;
}
-# endif
template <typename Q, typename Func>
std::pair<bool, bool> ensure( const Q& key, Func func )
// insert new
value_type newItem( key, mapped_type() );
it = m_List.insert( it, newItem );
- cds::unref( func )( true, *it );
+ func( true, *it );
return std::make_pair( true, true );
}
else {
// already exists
- cds::unref( func )( false, *it );
+ func( false, *it );
return std::make_pair( true, false );
}
}
return false;
// key exists
- cds::unref( f )( *it );
+ f( *it );
m_List.erase( it );
return true;
return false;
// key exists
- cds::unref( f )( *it );
+ f( *it );
m_List.erase( it );
return true;
return false;
// key exists
- cds::unref( f )( *it, val );
+ f( *it, val );
return true;
}
return false;
// key exists
- cds::unref( f )( *it, val );
+ f( *it, val );
return true;
}
}}} // namespace cds::intrusive::striped_set
//@endcond
-#endif // #ifndef __CDS_CONTAINER_STRIPED_MAP_BOOST_LIST_ADAPTER_H
+#endif // #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_LIST_ADAPTER_H