issue #11: replace _CDS_ header guard prefix with CDSLIB_

diff --git a/cds/opt/make_options_var.h b/cds/opt/make_options_var.h
index 935a025f97d8fc2f2ad8970633235d3b71f8dfdb..fb137466bfb93763d9309e6c537550d929db391b 100644 (file)
--- a/cds/opt/make_options_var.h
+++ b/cds/opt/make_options_var.h
@@ -150,24 +150,24 @@ namespace cds { namespace opt {
         };
 
         // Specializations for integral type of option
-#define _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION( _type ) template <template <_type> class What, _type A, _type B> \
+#define CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_( _type ) template <template <_type> class What, _type A, _type B> \
         struct compare_option< What<A>, What<B> > { typedef compare_ok type ; };
 
         // For user-defined enum types
-#define CDS_DECLARE_FIND_OPTION_INTEGRAL_SPECIALIZATION( _type ) namespace cds { namespace opt { namespace details { _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(_type ) }}}
-
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(bool)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(char)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(unsigned char)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(signed char)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(short int)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(unsigned short int)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(int)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(unsigned int)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(long)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(unsigned long)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(long long)
-        _CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION(unsigned long long)
+#define CDS_DECLARE_FIND_OPTION_INTEGRAL_SPECIALIZATION( _type ) namespace cds { namespace opt { namespace details { CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(_type ) }}}
+
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(bool)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(char)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned char)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(signed char)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(short int)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned short int)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(int)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned int)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(long)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned long)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(long long)
+        CDS_FIND_OPTION_INTEGRAL_SPECIALIZATION_(unsigned long long)
 
 
         template <typename CompResult, typename Ok, typename Fail>

diff --git a/cds/urcu/details/base.h b/cds/urcu/details/base.h
index 8aa281072d38ca38015d9ee0d030f21f5d7cf518..37864bd735cd0f85e20afc713a8f08c4687f8a47 100644 (file)
--- a/cds/urcu/details/base.h
+++ b/cds/urcu/details/base.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_BASE_H
-#define _CDS_URCU_DETAILS_BASE_H
+#ifndef CDSLIB_URCU_DETAILS_BASE_H
+#define CDSLIB_URCU_DETAILS_BASE_H
 
 #include <cds/algo/atomic.h>
 #include <cds/gc/details/retired_ptr.h>
@@ -455,4 +455,4 @@ namespace cds {
     } // namespace urcu
 } // namespace cds
 
-#endif // #ifndef _CDS_URCU_DETAILS_BASE_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_BASE_H

diff --git a/cds/urcu/details/check_deadlock.h b/cds/urcu/details/check_deadlock.h
index f63e425ebc08fb701b10d062f7106c5e9432f81a..160519205ffac6bfa9d5a4373b569be23b70202f 100644 (file)
--- a/cds/urcu/details/check_deadlock.h
+++ b/cds/urcu/details/check_deadlock.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_CHECK_DEADLOCK_H
-#define _CDS_URCU_DETAILS_CHECK_DEADLOCK_H
+#ifndef CDSLIB_URCU_DETAILS_CHECK_DEADLOCK_H
+#define CDSLIB_URCU_DETAILS_CHECK_DEADLOCK_H
 
 #include <cds/urcu/options.h>
 
@@ -38,4 +38,4 @@ namespace cds { namespace urcu { namespace details {
 }}} // namespace cds::urcu::details
 //@endcond
 
-#endif // #ifndef _CDS_URCU_DETAILS_CHECK_DEADLOCK_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_CHECK_DEADLOCK_H

diff --git a/cds/urcu/details/gp.h b/cds/urcu/details/gp.h
index 26c8ab8c553d5e449adae84883eff90d4ae1bd8b..cd30b98bbc65462931c9474f0d9419f4079bd7e4 100644 (file)
--- a/cds/urcu/details/gp.h
+++ b/cds/urcu/details/gp.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_GP_H
-#define _CDS_URCU_DETAILS_GP_H
+#ifndef CDSLIB_URCU_DETAILS_GP_H
+#define CDSLIB_URCU_DETAILS_GP_H
 
 #include <cds/urcu/details/gp_decl.h>
 #include <cds/threading/model.h>
@@ -98,4 +98,4 @@ namespace cds { namespace urcu { namespace details {
 }}} // namespace cds:urcu::details
 //@endcond
 
-#endif // #ifndef _CDS_URCU_DETAILS_GP_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_GP_H

diff --git a/cds/urcu/details/gp_decl.h b/cds/urcu/details/gp_decl.h
index 1c8705c9cad842bbb25b3330e7db48ea60784ce8..71b322bb4840e477e59213d50979dc0ed9d42a23 100644 (file)
--- a/cds/urcu/details/gp_decl.h
+++ b/cds/urcu/details/gp_decl.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_GP_DECL_H
-#define _CDS_URCU_DETAILS_GP_DECL_H
+#ifndef CDSLIB_URCU_DETAILS_GP_DECL_H
+#define CDSLIB_URCU_DETAILS_GP_DECL_H
 
 #include <cds/urcu/details/base.h>
 #include <cds/details/static_functor.h>
@@ -175,4 +175,4 @@ namespace cds { namespace urcu { namespace details {
 }}} // namespace cds::urcu::details
 //@endcond
 
-#endif // #ifndef _CDS_URCU_DETAILS_GP_DECL_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_GP_DECL_H

diff --git a/cds/urcu/details/gpb.h b/cds/urcu/details/gpb.h
index 9b0cbd1f48788b20f67a490d4fdc429d9c326dff..f79b6e22d2d2126f1e811d875a09498f997f7f5e 100644 (file)
--- a/cds/urcu/details/gpb.h
+++ b/cds/urcu/details/gpb.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_GPB_H
-#define _CDS_URCU_DETAILS_GPB_H
+#ifndef CDSLIB_URCU_DETAILS_GPB_H
+#define CDSLIB_URCU_DETAILS_GPB_H
 
 #include <mutex>
 #include <cds/urcu/details/gp.h>
@@ -215,4 +215,4 @@ namespace cds { namespace urcu {
 
 }} // namespace cds::urcu
 
-#endif // #ifndef _CDS_URCU_DETAILS_GPB_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_GPB_H

diff --git a/cds/urcu/details/gpi.h b/cds/urcu/details/gpi.h
index a9ffda3b5d694b02cd7e4cd82d4b79777ff42136..b72ffec6ebd50a1a90c397455b92423ded267062 100644 (file)
--- a/cds/urcu/details/gpi.h
+++ b/cds/urcu/details/gpi.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_GPI_H
-#define _CDS_URCU_DETAILS_GPI_H
+#ifndef CDSLIB_URCU_DETAILS_GPI_H
+#define CDSLIB_URCU_DETAILS_GPI_H
 
 #include <mutex>
 #include <cds/urcu/details/gp.h>
@@ -153,4 +153,4 @@ namespace cds { namespace urcu {
 
 }} // namespace cds::urcu
 
-#endif // #ifndef _CDS_URCU_DETAILS_GPI_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_GPI_H

diff --git a/cds/urcu/details/gpt.h b/cds/urcu/details/gpt.h
index 8d1031d78739269c0bfaf3eaf2fe42706f10180d..9bc0d876d7305fd5d3f888f815c7fcb59f4c568a 100644 (file)
--- a/cds/urcu/details/gpt.h
+++ b/cds/urcu/details/gpt.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$1
 
-#ifndef _CDS_URCU_DETAILS_GPT_H
-#define _CDS_URCU_DETAILS_GPT_H
+#ifndef CDSLIB_URCU_DETAILS_GPT_H
+#define CDSLIB_URCU_DETAILS_GPT_H
 
 #include <mutex>    //unique_lock
 #include <cds/urcu/details/gp.h>
@@ -220,4 +220,4 @@ namespace cds { namespace urcu {
     };
 }} // namespace cds::urcu
 
-#endif // #ifndef _CDS_URCU_DETAILS_GPT_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_GPT_H

diff --git a/cds/urcu/details/sh.h b/cds/urcu/details/sh.h
index 48ba977785528698d67e8a153db0358348c2b678..371272b5b45e88bcbaff1c839d9371cb399ba964 100644 (file)
--- a/cds/urcu/details/sh.h
+++ b/cds/urcu/details/sh.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_SH_H
-#define _CDS_URCU_DETAILS_SH_H
+#ifndef CDSLIB_URCU_DETAILS_SH_H
+#define CDSLIB_URCU_DETAILS_SH_H
 
 #include <memory.h> //memset
 #include <cds/urcu/details/sh_decl.h>
@@ -167,4 +167,4 @@ namespace cds { namespace urcu { namespace details {
 //@endcond
 
 #endif // #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-#endif // #ifndef _CDS_URCU_DETAILS_SH_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_SH_H

diff --git a/cds/urcu/details/sh_decl.h b/cds/urcu/details/sh_decl.h
index 55e649ef1ec701b4ecc75e84abae3d4fd270cd1f..d37cb456683bf9ecef7d97f61b76f40e40b79c63 100644 (file)
--- a/cds/urcu/details/sh_decl.h
+++ b/cds/urcu/details/sh_decl.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_SH_DECL_H
-#define _CDS_URCU_DETAILS_SH_DECL_H
+#ifndef CDSLIB_URCU_DETAILS_SH_DECL_H
+#define CDSLIB_URCU_DETAILS_SH_DECL_H
 
 #include <cds/urcu/details/base.h>
 
@@ -200,4 +200,4 @@ namespace cds { namespace urcu { namespace details {
 //@endcond
 
 #endif // #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-#endif // #ifndef _CDS_URCU_DETAILS_SH_DECL_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_SH_DECL_H

diff --git a/cds/urcu/details/sig_buffered.h b/cds/urcu/details/sig_buffered.h
index 5737b4acb84da11743121a0156e71311651fdd22..db4d88cf0eb08a1dcd6d28e3318cb104792b401b 100644 (file)
--- a/cds/urcu/details/sig_buffered.h
+++ b/cds/urcu/details/sig_buffered.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_DETAILS_SIG_BUFFERED_H
-#define _CDS_URCU_DETAILS_SIG_BUFFERED_H
+#ifndef CDSLIB_URCU_DETAILS_SIG_BUFFERED_H
+#define CDSLIB_URCU_DETAILS_SIG_BUFFERED_H
 
 #include <cds/urcu/details/sh.h>
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
@@ -228,4 +228,4 @@ namespace cds { namespace urcu {
 }} // namespace cds::urcu
 
 #endif // #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-#endif // #ifndef _CDS_URCU_DETAILS_SIG_BUFFERED_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_SIG_BUFFERED_H

diff --git a/cds/urcu/details/sig_threaded.h b/cds/urcu/details/sig_threaded.h
index 9fb2dfe979a5ff30a0ec88d24adff18d399e4aa1..cf99c543f37577a3b9aea8881e5c3179302e91e9 100644 (file)
--- a/cds/urcu/details/sig_threaded.h
+++ b/cds/urcu/details/sig_threaded.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$1
 
-#ifndef _CDS_URCU_DETAILS_SIG_THREADED_H
-#define _CDS_URCU_DETAILS_SIG_THREADED_H
+#ifndef CDSLIB_URCU_DETAILS_SIG_THREADED_H
+#define CDSLIB_URCU_DETAILS_SIG_THREADED_H
 
 #include <mutex>    //unique_lock
 #include <cds/urcu/details/sh.h>
@@ -233,4 +233,4 @@ namespace cds { namespace urcu {
 }} // namespace cds::urcu
 
 #endif // #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-#endif // #ifndef _CDS_URCU_DETAILS_SIG_THREADED_H
+#endif // #ifndef CDSLIB_URCU_DETAILS_SIG_THREADED_H

diff --git a/cds/urcu/dispose_thread.h b/cds/urcu/dispose_thread.h
index da2206612bbb2a75f860ccdf8106335ac3351d15..ca95603587dd1f7200e3b1cbb19a850070920b1f 100644 (file)
--- a/cds/urcu/dispose_thread.h
+++ b/cds/urcu/dispose_thread.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$1
 
-#ifndef _CDS_URCU_DISPOSE_THREAD_H
-#define _CDS_URCU_DISPOSE_THREAD_H
+#ifndef CDSLIB_URCU_DISPOSE_THREAD_H
+#define CDSLIB_URCU_DISPOSE_THREAD_H
 
 #include <memory>
 #include <thread>
@@ -195,4 +195,4 @@ namespace cds { namespace urcu {
     };
 }} // namespace cds::urcu
 
-#endif // #ifdef _CDS_URCU_DISPOSE_THREAD_H
+#endif // #ifdef CDSLIB_URCU_DISPOSE_THREAD_H

diff --git a/cds/urcu/general_buffered.h b/cds/urcu/general_buffered.h
index b55dd2e7b31596df1b1f93cde64766efb05b4225..110f395fee2df6ebbd9a4fd7dc025ec0584121ea 100644 (file)
--- a/cds/urcu/general_buffered.h
+++ b/cds/urcu/general_buffered.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_GENERAL_BUFFERED_H
-#define _CDS_URCU_GENERAL_BUFFERED_H
+#ifndef CDSLIB_URCU_GENERAL_BUFFERED_H
+#define CDSLIB_URCU_GENERAL_BUFFERED_H
 
 #include <cds/urcu/details/gpb.h>
 
@@ -147,4 +147,4 @@ namespace cds { namespace urcu {
 
 }} // namespace cds::urcu
 
-#endif // #ifndef _CDS_URCU_GENERAL_BUFFERED_H
+#endif // #ifndef CDSLIB_URCU_GENERAL_BUFFERED_H

diff --git a/cds/urcu/general_instant.h b/cds/urcu/general_instant.h
index c0c128cdb5b2d1805d6f93919c3be52fd85598a9..9097faac74a1678066611475e3c8134938053346 100644 (file)
--- a/cds/urcu/general_instant.h
+++ b/cds/urcu/general_instant.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_GENERAL_INSTANT_H
-#define _CDS_URCU_GENERAL_INSTANT_H
+#ifndef CDSLIB_URCU_GENERAL_INSTANT_H
+#define CDSLIB_URCU_GENERAL_INSTANT_H
 
 #include <cds/urcu/details/gpi.h>
 
@@ -135,4 +135,4 @@ namespace cds { namespace urcu {
 
 }} // namespace cds::urcu
 
-#endif // #ifndef _CDS_URCU_GENERAL_INSTANT_H
+#endif // #ifndef CDSLIB_URCU_GENERAL_INSTANT_H

diff --git a/cds/urcu/general_threaded.h b/cds/urcu/general_threaded.h
index 57e532207ca0879886ef5d698953a8240cc32128..54189aff96e81dc4b4b3c49082621d008a294fb1 100644 (file)
--- a/cds/urcu/general_threaded.h
+++ b/cds/urcu/general_threaded.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_GENERAL_THREADED_H
-#define _CDS_URCU_GENERAL_THREADED_H
+#ifndef CDSLIB_URCU_GENERAL_THREADED_H
+#define CDSLIB_URCU_GENERAL_THREADED_H
 
 #include <cds/urcu/details/gpt.h>
 
@@ -154,4 +154,4 @@ namespace cds { namespace urcu {
 
 }} // namespace cds::urcu
 
-#endif // #ifndef _CDS_URCU_GENERAL_THREADED_H
+#endif // #ifndef CDSLIB_URCU_GENERAL_THREADED_H

diff --git a/cds/urcu/options.h b/cds/urcu/options.h
index d1bc8b035534ffe2789b2c7bb2bb1da5d41e83ed..23a4cf94e616dabd6d7d4eecf99286989677d846 100644 (file)
--- a/cds/urcu/options.h
+++ b/cds/urcu/options.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_OPTIONS_H
-#define _CDS_URCU_OPTIONS_H
+#ifndef CDSLIB_URCU_OPTIONS_H
+#define CDSLIB_URCU_OPTIONS_H
 
 #include <cds/details/defs.h>
 
@@ -62,4 +62,4 @@ namespace cds { namespace opt {
 }}  // namespace cds::opt
 
 
-#endif  // #ifndef _CDS_URCU_OPTIONS_H
+#endif  // #ifndef CDSLIB_URCU_OPTIONS_H

diff --git a/cds/urcu/signal_buffered.h b/cds/urcu/signal_buffered.h
index c62ab3f07d582d390d2618d06996c2fb64a39969..c9ffe3157155ff634703896d6bface98780037d6 100644 (file)
--- a/cds/urcu/signal_buffered.h
+++ b/cds/urcu/signal_buffered.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_SIGNAL_BUFFERED_H
-#define _CDS_URCU_SIGNAL_BUFFERED_H
+#ifndef CDSLIB_URCU_SIGNAL_BUFFERED_H
+#define CDSLIB_URCU_SIGNAL_BUFFERED_H
 
 #include <cds/urcu/details/sig_buffered.h>
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
@@ -160,4 +160,4 @@ namespace cds { namespace urcu {
 }} // namespace cds::urcu
 
 #endif // #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-#endif // #ifndef _CDS_URCU_SIGNAL_BUFFERED_H
+#endif // #ifndef CDSLIB_URCU_SIGNAL_BUFFERED_H

diff --git a/cds/urcu/signal_threaded.h b/cds/urcu/signal_threaded.h
index 3d4971dbb2514a02efb16910404daea06631734d..24d0795c28ea1c48a5c0927a3fd5a6e1a364b0a8 100644 (file)
--- a/cds/urcu/signal_threaded.h
+++ b/cds/urcu/signal_threaded.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDS_URCU_SIGNAL_THREADED_H
-#define _CDS_URCU_SIGNAL_THREADED_H
+#ifndef CDSLIB_URCU_SIGNAL_THREADED_H
+#define CDSLIB_URCU_SIGNAL_THREADED_H
 
 #include <cds/urcu/details/sig_threaded.h>
 
@@ -168,4 +168,4 @@ namespace cds { namespace urcu {
 }} // namespace cds::urcu
 
 #endif // #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-#endif // #ifndef _CDS_URCU_SIGNAL_THREADED_H
+#endif // #ifndef CDSLIB_URCU_SIGNAL_THREADED_H

diff --git a/src/hp_const.h b/src/hp_const.h
index 279b43f6f02ce63e740636b24d1d5cac13fd5b3a..3c712d7ce6709c3730bc640fe7be134ef702b8c1 100644 (file)
--- a/src/hp_const.h
+++ b/src/hp_const.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSIMPL_HP_CONST_H
-#define __CDSIMPL_HP_CONST_H
+#ifndef CDSIMPL_HP_CONST_H
+#define CDSIMPL_HP_CONST_H
 
 /*
     File: hp_const.h
@@ -27,4 +27,4 @@ namespace cds { namespace gc {
 
 } /* namespace gc */ }    /* namespace cds */
 
-#endif    // #ifndef __CDSIMPL_HZP_CONST_H
+#endif    // #ifndef CDSIMPL_HP_CONST_H