-//$$CDS-header$$
+/*
+ This file is a part of libcds - Concurrent Data Structures library
-#ifndef __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H
-#define __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_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_DETAILS_MAKE_SKIP_LIST_MAP_H
+#define CDSLIB_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H
#include <cds/container/details/skip_list_base.h>
#include <cds/details/binary_functor_wrapper.h>
template <typename Q>
node_type( unsigned int nHeight, atomic_marked_ptr * pTower, Q const& key )
- : m_Value( std::make_pair( key, mapped_type() ))
+ : m_Value( std::make_pair( key, mapped_type()))
{
init_tower( nHeight, pTower );
}
init_tower( nHeight, pTower );
}
- private:
- node_type() ; // no default ctor
+ node_type() = delete;
+ private:
void init_tower( unsigned int nHeight, atomic_marked_ptr * pTower )
{
if ( nHeight > 1 ) {
template <typename Q>
node_type * New( unsigned int nHeight, Q const& key )
{
- return base_class::New( nHeight, key );
+ return base_class::New( nHeight, key_type( key ));
}
template <typename Q, typename U>
node_type * New( unsigned int nHeight, Q const& key, U const& val )
return new( pMem )
node_type( nHeight,
nHeight > 1 ? reinterpret_cast<typename base_class::node_tower_item *>( pMem + base_class::c_nNodeSize ) : nullptr,
- key, val
+ key_type( key ), mapped_type( val )
);
}
template <typename... Args>
}}} // namespace cds::container::details
//@endcond
-#endif // __CDS_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H
+#endif // CDSLIB_CONTAINER_DETAILS_MAKE_SKIP_LIST_MAP_H