Fix clang 3.4-3.5 64bit build (boost.atomic problem, see https://svn.boost.org/trac...

[libcds.git] / cds / container / skip_list_map_nogc.h

diff --git a/cds/container/skip_list_map_nogc.h b/cds/container/skip_list_map_nogc.h
index cb402ebe4eb0001462c6cd7e40fbd3526732d541..76644e65bcbc2fc98d93b1bf8be7fb2651d400c4 100644 (file)
--- a/cds/container/skip_list_map_nogc.h
+++ b/cds/container/skip_list_map_nogc.h
@@ -262,22 +262,17 @@ namespace cds { namespace container {
             return it;
         }
 
-#   ifdef CDS_EMPLACE_SUPPORT
         /// For key \p key inserts data of type \ref mapped_type constructed with <tt>std::forward<Args>(args)...</tt>
         /**
             \p key_type should be constructible from type \p K
 
             Returns \p true if inserting successful, \p false otherwise.
-
-            This function is available only for compiler that supports
-            variadic template and move semantics
         */
         template <typename K, typename... Args>
         iterator emplace( K&& key, Args&&... args )
         {
             return base_class::emplace( std::forward<K>(key), std::move(mapped_type(std::forward<Args>(args)...)));
         }
-#   endif
 
         /// Ensures that the key \p key exists in the map
         /**
@@ -323,7 +318,7 @@ namespace cds { namespace container {
 
         /// Gets minimum key from the map
         /**
-            If the map is empty the function returns \p NULL
+            If the map is empty the function returns \p nullptr
         */
         value_type * get_min() const
         {
@@ -332,7 +327,7 @@ namespace cds { namespace container {
 
         /// Gets maximum key from the map
         /**
-            The function returns \p NULL if the map is empty
+            The function returns \p nullptr if the map is empty
         */
         value_type * get_max() const
         {