Removed trailing spaces

[libcds.git] / cds / container / striped_map / boost_map.h

diff --git a/cds/container/striped_map/boost_map.h b/cds/container/striped_map/boost_map.h
index 371cf9c792b8c3986557cf5725ad0fb23d91cb4e..cc1b7a7e0269be4ee6e7dae59fc61519f5166528 100644 (file)
--- a/cds/container/striped_map/boost_map.h
+++ b/cds/container/striped_map/boost_map.h
@@ -1,7 +1,35 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
 
-#ifndef __CDS_CONTAINER_STRIPED_MAP_BOOST_MAP_ADAPTER_H
-#define __CDS_CONTAINER_STRIPED_MAP_BOOST_MAP_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_MAP_ADAPTER_H
+#define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_MAP_ADAPTER_H
 
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
@@ -27,28 +55,26 @@ namespace cds { namespace container {
             : public details::boost_map_copy_policies<boost::container::map< Key, T, Traits, Alloc > >::swap_item_policy
         {};
 
-#ifdef CDS_MOVE_SEMANTICS_SUPPORT
         // Move policy for map
         template <typename Key, typename T, typename Traits, typename Alloc>
         struct move_item_policy< boost::container::map< Key, T, Traits, Alloc > >
             : public details::boost_map_copy_policies<boost::container::map< Key, T, Traits, Alloc > >::move_item_policy
         {};
-#endif
     }   // namespace striped_set
 }} // namespace cds::container
 
 namespace cds { namespace intrusive { namespace striped_set {
 
     /// std::set adapter for hash set bucket
-    template <typename Key, typename T, class Traits, class Alloc, CDS_SPEC_OPTIONS>
-    class adapt< boost::container::map< Key, T, Traits, Alloc>, CDS_OPTIONS >
+    template <typename Key, typename T, class Traits, class Alloc, typename... Options>
+    class adapt< boost::container::map< Key, T, Traits, Alloc>, Options... >
     {
     public:
         typedef boost::container::map< Key, T, Traits, Alloc>     container_type          ;   ///< underlying container type
-        typedef cds::container::striped_set::details::boost_map_adapter< container_type, CDS_OPTIONS >    type;
+        typedef cds::container::striped_set::details::boost_map_adapter< container_type, Options... >    type;
     };
 }}} // namespace cds::intrusive::striped_set
 
 //@endcond
 
-#endif // #ifndef __CDS_CONTAINER_STRIPED_MAP_BOOST_MAP_ADAPTER_H
+#endif // #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_MAP_ADAPTER_H