issue#11: cds: changed __CDS_ guard prefix to CDSLIB_ for all .h files

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

diff --git a/cds/container/striped_map/boost_flat_map.h b/cds/container/striped_map/boost_flat_map.h
index 50b98d5aa952899128c703a29c4f64d70d6588a9..b0e09ce44f0938e433189b1f63fdb53efbc91f5d 100644 (file)
--- a/cds/container/striped_map/boost_flat_map.h
+++ b/cds/container/striped_map/boost_flat_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CONTAINER_STRIPED_MAP_BOOST_FLAT_MAP_ADAPTER_H
-#define __CDS_CONTAINER_STRIPED_MAP_BOOST_FLAT_MAP_ADAPTER_H
+#ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_FLAT_MAP_ADAPTER_H
+#define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_FLAT_MAP_ADAPTER_H
 
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
@@ -42,15 +42,15 @@ namespace cds { namespace container {
 
 namespace cds { namespace intrusive { namespace striped_set {
 
-    template <typename Key, typename T, class Traits, class Alloc, CDS_SPEC_OPTIONS>
-    class adapt< boost::container::flat_map< Key, T, Traits, Alloc>, CDS_OPTIONS >
+    template <typename Key, typename T, class Traits, class Alloc, typename... Options>
+    class adapt< boost::container::flat_map< Key, T, Traits, Alloc>, Options... >
     {
     public:
         typedef boost::container::flat_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_FLAT_MAP_ADAPTER_H
+#endif // #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_FLAT_MAP_ADAPTER_H