issue#11: tests/unit: changed .h file guard prefix to CDSUNIT_xxx

diff --git a/tests/unit/alloc/random_gen.h b/tests/unit/alloc/random_gen.h
index 9d6c66c16caf3eef2e9c18eb967e2e5181d93ab4..743fefe6e377649d2a6619c3a39d7966ae2a9b32 100644 (file)
--- a/tests/unit/alloc/random_gen.h
+++ b/tests/unit/alloc/random_gen.h
@@ -2,8 +2,8 @@
 
 // Random number geerator
 
-#ifndef __CPPUNIT_MEMORY_RANDOM_GEN_H
-#define __CPPUNIT_MEMORY_RANDOM_GEN_H
+#ifndef CPPUNIT_MEMORY_RANDOM_GEN_H
+#define CPPUNIT_MEMORY_RANDOM_GEN_H
 
 
 #include <boost/random/mersenne_twister.hpp>
@@ -41,4 +41,4 @@ namespace memory {
     };
 }   // namespace memory
 
-#endif // __CPPUNIT_MEMORY_RANDOM_GEN_H
+#endif // CPPUNIT_MEMORY_RANDOM_GEN_H

diff --git a/tests/unit/lock/nolock.h b/tests/unit/lock/nolock.h
index 0fa37703295232f11719e54e1f58363eab307876..0d7ae302f21f1eb1a5a65eee320711fffdd6a53f 100644 (file)
--- a/tests/unit/lock/nolock.h
+++ b/tests/unit/lock/nolock.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_LOCK_NOLOCK_H
-#define __UNIT_LOCK_NOLOCK_H
+#ifndef CDSUNIT_LOCK_NOLOCK_H
+#define CDSUNIT_LOCK_NOLOCK_H
 
 namespace lock {
     // Win32 critical section
@@ -13,4 +13,4 @@ namespace lock {
     };
 }
 
-#endif // #ifndef __UNIT_LOCK_NOLOCK_H
+#endif // #ifndef CDSUNIT_LOCK_NOLOCK_H

diff --git a/tests/unit/lock/win32_lock.h b/tests/unit/lock/win32_lock.h
index ff3ddb60b99a64bd2326ff6e4ae8448d392cdb20..760924b6dedaee7d04d0204f01976950e7313e2c 100644 (file)
--- a/tests/unit/lock/win32_lock.h
+++ b/tests/unit/lock/win32_lock.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_LOCK_WIN32_LOCK_H
-#define __UNIT_LOCK_WIN32_LOCK_H
+#ifndef CDSUNIT_LOCK_WIN32_LOCK_H
+#define CDSUNIT_LOCK_WIN32_LOCK_H
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
@@ -39,4 +39,4 @@ namespace lock {
 }   // namespace lock
 
 #endif  // defined(_WIN32) || defined(_WIN64)
-#endif  // #ifndef __UNIT_LOCK_WIN32_LOCK_H
+#endif  // #ifndef CDSUNIT_LOCK_WIN32_LOCK_H

diff --git a/tests/unit/map2/map_defs.h b/tests/unit/map2/map_defs.h
index 46577d8dc5f10107627aa1f881546fcbc12c42d8..1818e7ddb678859be8f497ab100306bdb182c6ed 100644 (file)
--- a/tests/unit/map2/map_defs.h
+++ b/tests/unit/map2/map_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_MAP2_MAP_DEFS_H
-#define _CDSUNIT_MAP2_MAP_DEFS_H
+#ifndef CDSUNIT_MAP_DEFS_H
+#define CDSUNIT_MAP_DEFS_H
 
 #define CDSUNIT_DECLARE_StdMap \
     TEST_MAP(StdMap_Spin) \
@@ -577,4 +577,4 @@ TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_st_less_stat)
     CPPUNIT_TEST(CuckooRefinableMap_vector_ord_stat)\
     CPPUNIT_TEST(CuckooRefinableMap_vector_ord_storehash)
 
-#endif // #ifndef _CDSUNIT_MAP2_MAP_DEFS_H
+#endif // #ifndef CDSUNIT_MAP_DEFS_H

diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index 837570f6690ff256bb19da89813e7ea0e4cb2c42..8a4c99a0043a4b344ad63f0f6837cced72126630 100644 (file)
--- a/tests/unit/map2/map_types.h
+++ b/tests/unit/map2/map_types.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_MAP2_MAP_TYPES_H
-#define _CDSUNIT_MAP2_MAP_TYPES_H
+#ifndef CDSUNIT_MAP_TYPES_H
+#define CDSUNIT_MAP_TYPES_H
 
 #include <cds/urcu/general_instant.h>
 #include <cds/urcu/general_buffered.h>
@@ -1808,4 +1808,4 @@ namespace map2 {
     }
 }   // namespace map2
 
-#endif // ifndef _CDSUNIT_MAP2_MAP_TYPES_H
+#endif // ifndef CDSUNIT_MAP_TYPES_H

diff --git a/tests/unit/map2/std_hash_map.h b/tests/unit/map2/std_hash_map.h
index cb9cd407e68f7c8d156ced347129b68aec266978..067e69f83af57747a7a5b8e2af2fa4438015cb34 100644 (file)
--- a/tests/unit/map2/std_hash_map.h
+++ b/tests/unit/map2/std_hash_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_HASH_MAP_GCC_H
-#define __CDSUNIT_STD_HASH_MAP_GCC_H
+#ifndef CDSUNIT_STD_HASH_MAP_GCC_H
+#define CDSUNIT_STD_HASH_MAP_GCC_H
 
 #include <mutex>    //unique_lock
 #include <unordered_map>
@@ -96,4 +96,4 @@ namespace map2 {
     };
 }   // namespace map2
 
-#endif  // #ifndef __CDSUNIT_STD_HASH_MAP_GCC_H
+#endif  // #ifndef CDSUNIT_STD_HASH_MAP_GCC_H

diff --git a/tests/unit/map2/std_map.h b/tests/unit/map2/std_map.h
index 58508cd60427092c07f39250698cd47095403bd5..6923472c5489d264ea32fa88e5798ab27ee4a5f5 100644 (file)
--- a/tests/unit/map2/std_map.h
+++ b/tests/unit/map2/std_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_MAP_GCC_H
-#define __CDSUNIT_STD_MAP_GCC_H
+#ifndef CDSUNIT_STD_MAP_GCC_H
+#define CDSUNIT_STD_MAP_GCC_H
 
 #include <map>
 #include <mutex>    //unique_lock
@@ -86,4 +86,4 @@ namespace map2 {
     };
 }   // namespace map
 
-#endif  // #ifndef __CDSUNIT_STD_MAP_GCC_H
+#endif  // #ifndef CDSUNIT_STD_MAP_GCC_H

diff --git a/tests/unit/nonconcurrent_iterator_sequence.h b/tests/unit/nonconcurrent_iterator_sequence.h
index 0d45e43b39dd411dc1e131572fb8aca276403196..9e89e6b171b3eacedb0d50ded855762423ae58db 100644 (file)
--- a/tests/unit/nonconcurrent_iterator_sequence.h
+++ b/tests/unit/nonconcurrent_iterator_sequence.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
-#define __UNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
+#ifndef CDSUNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
+#define CDSUNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
 
 #include <cds/details/bounded_array.h>
 #include <cds/atomic.h>
@@ -135,4 +135,4 @@ namespace map { namespace nonconcurrent_iterator {
 
 } } // namespace map::nonconcurrent_iterator
 
-#endif    // #ifndef __UNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
+#endif    // #ifndef CDSUNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H

diff --git a/tests/unit/pqueue/ellen_bintree_pqueue.h b/tests/unit/pqueue/ellen_bintree_pqueue.h
index 8441e02dddcc7a03423d46bd3cbd883704e03c6c..df08a103854c4080e31ef1a1bf042f5a3c72786f 100644 (file)
--- a/tests/unit/pqueue/ellen_bintree_pqueue.h
+++ b/tests/unit/pqueue/ellen_bintree_pqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
-#define __CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
+#ifndef CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
+#define CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
 
 #include <cds/container/ellen_bintree_set_hp.h>
 #include <cds/container/ellen_bintree_set_dhp.h>
@@ -110,4 +110,4 @@ namespace pqueue {
 } // namespace pqueue
 
 
-#endif // #ifndef __CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
+#endif // #ifndef CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H

diff --git a/tests/unit/pqueue/pqueue_defs.h b/tests/unit/pqueue/pqueue_defs.h
index 4dcf3734fa01c13684eec65783abf48e6a11297f..d89f856d0c1d14968bf5e2afcb8223638202b7a7 100644 (file)
--- a/tests/unit/pqueue/pqueue_defs.h
+++ b/tests/unit/pqueue/pqueue_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_PQUEUE_PQUEUE_DEFS_H
-#define _CDSUNIT_PQUEUE_PQUEUE_DEFS_H
+#ifndef CDSUNIT_PQUEUE_PQUEUE_DEFS_H
+#define CDSUNIT_PQUEUE_PQUEUE_DEFS_H
 
 // MSPriorityQueue
 #define CDSUNIT_DECLARE_MSPriorityQueue \
@@ -179,4 +179,4 @@
     CPPUNIT_TEST(StdPQueue_deque_mutex)
 
 
-#endif // #ifndef _CDSUNIT_PQUEUE_PQUEUE_DEFS_H
+#endif // #ifndef CDSUNIT_PQUEUE_PQUEUE_DEFS_H

diff --git a/tests/unit/pqueue/pqueue_item.h b/tests/unit/pqueue/pqueue_item.h
index 5ce8453faf90407350b3703f366a0bf46942e974..49b2a422bb4d0e089924e963fbe6aba6e8e89be8 100644 (file)
--- a/tests/unit/pqueue/pqueue_item.h
+++ b/tests/unit/pqueue/pqueue_item.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_PQUEUE_ITEM_H
-#define __CDSUNIT_PQUEUE_ITEM_H
+#ifndef CDSUNIT_PQUEUE_ITEM_H
+#define CDSUNIT_PQUEUE_ITEM_H
 
 namespace pqueue {
     struct SimpleValue {
@@ -72,4 +72,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __CDSUNIT_PQUEUE_ITEM_H
+#endif // #ifndef CDSUNIT_PQUEUE_ITEM_H

diff --git a/tests/unit/pqueue/pqueue_type.h b/tests/unit/pqueue/pqueue_type.h
index 2eb0dece00c83e0fbf1095f3391cbc25ba73fda6..5c90614069aa7e1f0cf30c199ceb30fdf678eb61 100644 (file)
--- a/tests/unit/pqueue/pqueue_type.h
+++ b/tests/unit/pqueue/pqueue_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PQUEUE_TYPES_H
-#define __UNIT_PQUEUE_TYPES_H
+#ifndef CDSUNIT_PQUEUE_TYPES_H
+#define CDSUNIT_PQUEUE_TYPES_H
 
 #include <cds/container/mspriority_queue.h>
 #include <cds/container/fcpriority_queue.h>
@@ -327,4 +327,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PQUEUE_TYPES_H
+#endif // #ifndef CDSUNIT_PQUEUE_TYPES_H

diff --git a/tests/unit/pqueue/skiplist_pqueue.h b/tests/unit/pqueue/skiplist_pqueue.h
index 0ca4e1b8632f3c3bd2e0dc25221edf3ba61e3ea2..89bae9cc290f4a7db4833693209b6794d6f906ea 100644 (file)
--- a/tests/unit/pqueue/skiplist_pqueue.h
+++ b/tests/unit/pqueue/skiplist_pqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_SKIPLIST_PQUEUE_H
-#define __CDSUNIT_SKIPLIST_PQUEUE_H
+#ifndef CDSUNIT_SKIPLIST_PQUEUE_H
+#define CDSUNIT_SKIPLIST_PQUEUE_H
 
 #include <cds/container/skip_list_set_hp.h>
 #include <cds/container/skip_list_set_dhp.h>
@@ -109,4 +109,4 @@ namespace pqueue {
 
 } // namespace pqueue
 
-#endif // #ifndef __CDSUNIT_SKIPLIST_PQUEUE_H
+#endif // #ifndef CDSUNIT_SKIPLIST_PQUEUE_H

diff --git a/tests/unit/pqueue/std_pqueue.h b/tests/unit/pqueue/std_pqueue.h
index d95a88c4d153095aaada4e554d313253c41a753f..996c41ef202b7bf0a92879ee4f800103dfa2f239 100644 (file)
--- a/tests/unit/pqueue/std_pqueue.h
+++ b/tests/unit/pqueue/std_pqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_PQUEUE_H
-#define __CDSUNIT_STD_PQUEUE_H
+#ifndef CDSUNIT_STD_PQUEUE_H
+#define CDSUNIT_STD_PQUEUE_H
 
 #include <queue>
 #include <mutex>    //unique_lock
@@ -94,4 +94,4 @@ namespace std {
     }
 }
 
-#endif // #ifndef __CDSUNIT_STD_PQUEUE_H
+#endif // #ifndef CDSUNIT_STD_PQUEUE_H

diff --git a/tests/unit/print_cuckoo_stat.h b/tests/unit/print_cuckoo_stat.h
index e94d66187eb009012f4d28b43b47e64f6f5925ae..1d2fc9cf7c4853f77ae4ccd2a924b2f3b19ce16a 100644 (file)
--- a/tests/unit/print_cuckoo_stat.h
+++ b/tests/unit/print_cuckoo_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_CUCKOO_STAT_H
-#define __UNIT_PRINT_CUCKOO_STAT_H
+#ifndef CDSUNIT_PRINT_CUCKOO_STAT_H
+#define CDSUNIT_PRINT_CUCKOO_STAT_H
 
 #include <cds/intrusive/cuckoo_set.h>
 #include <ostream>
@@ -86,4 +86,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PRINT_CUCKOO_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_CUCKOO_STAT_H

diff --git a/tests/unit/print_ellenbintree_stat.h b/tests/unit/print_ellenbintree_stat.h
index 47733c8662582cf5c796beeb6d2ec638a3dfaff5..2070d4adbe85fdec92e5dde27b81c8bf0655bbf5 100644 (file)
--- a/tests/unit/print_ellenbintree_stat.h
+++ b/tests/unit/print_ellenbintree_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_ELLENBINTREE_STAT_H
-#define __UNIT_PRINT_ELLENBINTREE_STAT_H
+#ifndef CDSUNIT_PRINT_ELLENBINTREE_STAT_H
+#define CDSUNIT_PRINT_ELLENBINTREE_STAT_H
 
 #include "ellen_bintree_update_desc_pool.h"
 #include <ostream>
@@ -47,4 +47,4 @@ namespace std {
     }
 }
 
-#endif // #ifndef __UNIT_PRINT_ELLENBINTREE_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_ELLENBINTREE_STAT_H

diff --git a/tests/unit/print_mspriorityqueue_stat.h b/tests/unit/print_mspriorityqueue_stat.h
index 39d2595cb25089a3da0bf4774e63177adf229670..0d47f2e6b00e5677adf4c1eb9552d4f85b8a7c9f 100644 (file)
--- a/tests/unit/print_mspriorityqueue_stat.h
+++ b/tests/unit/print_mspriorityqueue_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_MSPRIORITYQUEUE_STAT_H
-#define __UNIT_PRINT_MSPRIORITYQUEUE_STAT_H
+#ifndef CDSUNIT_PRINT_MSPRIORITYQUEUE_STAT_H
+#define CDSUNIT_PRINT_MSPRIORITYQUEUE_STAT_H
 
 #include <cds/container/mspriority_queue.h>
 
@@ -23,4 +23,4 @@ namespace std {
     }
 }
 
-#endif // #ifndef __UNIT_PRINT_MSPRIORITYQUEUE_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_MSPRIORITYQUEUE_STAT_H

diff --git a/tests/unit/print_segmentedqueue_stat.h b/tests/unit/print_segmentedqueue_stat.h
index 834e9212f3922d5816c868d2bc3f9a8bad2c3128..2dd1aa420a3898ec83dd9e613736e4fcef5fff82 100644 (file)
--- a/tests/unit/print_segmentedqueue_stat.h
+++ b/tests/unit/print_segmentedqueue_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_SEGMENTEDQUEUE_STAT_H
-#define __UNIT_PRINT_SEGMENTEDQUEUE_STAT_H
+#ifndef CDSUNIT_PRINT_SEGMENTEDQUEUE_STAT_H
+#define CDSUNIT_PRINT_SEGMENTEDQUEUE_STAT_H
 
 #include <ostream>
 
@@ -28,4 +28,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PRINT_SEGMENTEDQUEUE_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_SEGMENTEDQUEUE_STAT_H

diff --git a/tests/unit/print_skip_list_stat.h b/tests/unit/print_skip_list_stat.h
index ae7effb25fa64b6c17eaaa67623b22edfb881ac8..7633a7538ec4ed699b5576533c530d7721219250 100644 (file)
--- a/tests/unit/print_skip_list_stat.h
+++ b/tests/unit/print_skip_list_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_SKIP_LIST_STAT_H
-#define __UNIT_PRINT_SKIP_LIST_STAT_H
+#ifndef CDSUNIT_PRINT_SKIP_LIST_STAT_H
+#define CDSUNIT_PRINT_SKIP_LIST_STAT_H
 
 #include <cds/intrusive/details/skip_list_base.h>
 #include <ostream>
@@ -59,4 +59,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PRINT_SKIP_LIST_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_SKIP_LIST_STAT_H

diff --git a/tests/unit/print_split_list_stat.h b/tests/unit/print_split_list_stat.h
index 8275d8d60cf2ade3ab6805edc833ddbae120b8e9..c6f1ab486b66b0f3d0cd7d6e32701adc643e52f0 100644 (file)
--- a/tests/unit/print_split_list_stat.h
+++ b/tests/unit/print_split_list_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_SPLIT_LIST_STAT_H
-#define __UNIT_PRINT_SPLIT_LIST_STAT_H
+#ifndef CDSUNIT_PRINT_SPLIT_LIST_STAT_H
+#define CDSUNIT_PRINT_SPLIT_LIST_STAT_H
 
 #include <cds/intrusive/details/split_list_base.h>
 #include <ostream>
@@ -36,4 +36,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PRINT_SKIP_LIST_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_SKIP_LIST_STAT_H

diff --git a/tests/unit/queue/intrusive_queue_defs.h b/tests/unit/queue/intrusive_queue_defs.h
index 4bcffb990a3c15882b66f01e11f8b97c6d77f2fc..58e010b63167f8b13f95e6b9dcfa0e179d131cc1 100644 (file)
--- a/tests/unit/queue/intrusive_queue_defs.h
+++ b/tests/unit/queue/intrusive_queue_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
-#define __CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
+#ifndef CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
+#define CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
 
 // MSQueue
 #define CDSUNIT_DECLARE_MSQueue \
@@ -163,4 +163,4 @@
     CPPUNIT_TEST( BoostSList_mutex ) \
     CPPUNIT_TEST( BoostSList_spin )
 
-#endif // #ifndef __CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
+#endif // #ifndef CDSUNIT_INTRUSIVE_QUEUE_DEFS_H

diff --git a/tests/unit/queue/intrusive_queue_type.h b/tests/unit/queue/intrusive_queue_type.h
index 67c30d76ea4aebc8602fafe9e8981eecc24ef039..97605ae35471289975ac00a80f34d8c53cb5d3f7 100644 (file)
--- a/tests/unit/queue/intrusive_queue_type.h
+++ b/tests/unit/queue/intrusive_queue_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
-#define __CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
+#ifndef CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
+#define CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
 
 #include <cds/intrusive/msqueue.h>
 #include <cds/intrusive/moir_queue.h>
@@ -589,4 +589,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
+#endif // #ifndef CDSUNIT_INTRUSIVE_QUEUE_TYPES_H

diff --git a/tests/unit/queue/queue_defs.h b/tests/unit/queue/queue_defs.h
index fa3b951a39cac0c869a091ee9720b1f7849e46a2..37c3e118fa1253510907c3e8d73f1f21df47454e 100644 (file)
--- a/tests/unit/queue/queue_defs.h
+++ b/tests/unit/queue/queue_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_QUEUE_DEFS_H
-#define __CDSUNIT_QUEUE_DEFS_H
+#ifndef CDSUNIT_QUEUE_DEFS_H
+#define CDSUNIT_QUEUE_DEFS_H
 
 // MoirQueue
 #define CDSUNIT_DECLARE_MoirQueue( ITEM_TYPE ) \
@@ -243,4 +243,4 @@
     CPPUNIT_TEST(StdQueue_list_BoostMutex)
 
 
-#endif // #ifndef __CDSUNIT_QUEUE_DEFS_H
+#endif // #ifndef CDSUNIT_QUEUE_DEFS_H

diff --git a/tests/unit/queue/queue_type.h b/tests/unit/queue/queue_type.h
index a1a58ec9d851a48b676fffb629306dfca6f29131..6262551641fe619437ab574c0442fa78cd2ce6ec 100644 (file)
--- a/tests/unit/queue/queue_type.h
+++ b/tests/unit/queue/queue_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_QUEUE_TYPES_H
-#define __CDSUNIT_QUEUE_TYPES_H
+#ifndef CDSUNIT_QUEUE_TYPES_H
+#define CDSUNIT_QUEUE_TYPES_H
 
 #include <cds/container/msqueue.h>
 #include <cds/container/moir_queue.h>
@@ -637,4 +637,4 @@ namespace std {
 
 }
 
-#endif // #ifndef __CDSUNIT_QUEUE_TYPES_H
+#endif // #ifndef CDSUNIT_QUEUE_TYPES_H

diff --git a/tests/unit/queue/std_queue.h b/tests/unit/queue/std_queue.h
index 5c6d33e6ca4dee754bf64f7c6d7b3724608b1ff3..42935e36326e49c7607b18f16aca29b72b7198a2 100644 (file)
--- a/tests/unit/queue/std_queue.h
+++ b/tests/unit/queue/std_queue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_QUEUE_STD_QUEUE_H
-#define __UNIT_QUEUE_STD_QUEUE_H
+#ifndef CDSUNIT_QUEUE_STD_QUEUE_H
+#define CDSUNIT_QUEUE_STD_QUEUE_H
 
 #include <mutex>    //unique_lock
 #include <queue>
@@ -51,4 +51,4 @@ namespace queue {
     {};
 }
 
-#endif // #ifndef __UNIT_QUEUE_STD_QUEUE_H
+#endif // #ifndef CDSUNIT_QUEUE_STD_QUEUE_H

diff --git a/tests/unit/set2/set_defs.h b/tests/unit/set2/set_defs.h
index 5eda5f718df3608319a616c49bff2a7d0b0057ae..e57384efd7d91ce5f3556e04f33112a363f7806f 100644 (file)
--- a/tests/unit/set2/set_defs.h
+++ b/tests/unit/set2/set_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_SET2_SET_DEFS_H
-#define _CDSUNIT_SET2_SET_DEFS_H
+#ifndef CDSUNIT_SET_DEFS_H
+#define CDSUNIT_SET_DEFS_H
 
 #define CDSUNIT_DECLARE_StdSet \
     TEST_SET(StdSet_Spin) \
@@ -548,4 +548,4 @@
     CDSUNIT_TEST_RefinableSet_boost_container \
     CDSUNIT_TEST_RefinableSet_boost_flat_container
 
-#endif // #ifndef _CDSUNIT_SET2_SET_DEFS_H
+#endif // #ifndef CDSUNIT_SET_DEFS_H

diff --git a/tests/unit/set2/set_types.h b/tests/unit/set2/set_types.h
index 20f54a9844d306c65025bb35c60ad5ccdae18b99..ea0c63cd1a92cebb7b5f1cc385712df2f4a547e0 100644 (file)
--- a/tests/unit/set2/set_types.h
+++ b/tests/unit/set2/set_types.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_SET2_SET_TYPES_H
-#define _CDSUNIT_SET2_SET_TYPES_H
+#ifndef CDSUNIT_SET_TYPES_H
+#define CDSUNIT_SET_TYPES_H
 
 #include <cds/urcu/general_instant.h>
 #include <cds/urcu/general_buffered.h>
@@ -1808,4 +1808,4 @@ namespace set2 {
 
 }   // namespace set2
 
-#endif // ifndef _CDSUNIT_SET2_SET_TYPES_H
+#endif // ifndef CDSUNIT_SET_TYPES_H

diff --git a/tests/unit/set2/std_hash_set.h b/tests/unit/set2/std_hash_set.h
index 2089bb05795b184cf7813d8c971a40dfe7a55033..5338c13fa4a60294d1b7763dce028fdfdce7d561 100644 (file)
--- a/tests/unit/set2/std_hash_set.h
+++ b/tests/unit/set2/std_hash_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_HASH_SET_STD_H
-#define __CDSUNIT_STD_HASH_SET_STD_H
+#ifndef CDSUNIT_STD_HASH_SET_H
+#define CDSUNIT_STD_HASH_SET_H
 
 #include <unordered_set>
 #include <mutex>    //unique_lock
@@ -99,4 +99,4 @@ namespace set2 {
     };
 }   // namespace set2
 
-#endif  // #ifndef __CDSUNIT_STD_HASH_SET_STD_H
+#endif  // #ifndef CDSUNIT_STD_HASH_SET_H

diff --git a/tests/unit/set2/std_set.h b/tests/unit/set2/std_set.h
index 09f8fc0ff8d9615d40617f9edf2dce780410ff29..3ad196e8885803adc59887921bab8ccd7ce23dad 100644 (file)
--- a/tests/unit/set2/std_set.h
+++ b/tests/unit/set2/std_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_SET_VC_H
-#define __CDSUNIT_STD_SET_VC_H
+#ifndef CDSUNIT_STD_SET_H
+#define CDSUNIT_STD_SET_H
 
 #include <set>
 #include <mutex>    //unique_lock
@@ -87,4 +87,4 @@ namespace set2 {
     };
 } // namespace set2
 
-#endif  // #ifndef __CDSUNIT_STD_MAP_VC_H
+#endif  // #ifndef CDSUNIT_STD_MAP_H

diff --git a/tests/unit/stack/intrusive_stack_defs.h b/tests/unit/stack/intrusive_stack_defs.h
index 06e0a2bc9987aebca9b014992a3de9508c4f790a..0dd87b3f101d001dbdc57b0abea449924bc5c9bc 100644 (file)
--- a/tests/unit/stack/intrusive_stack_defs.h
+++ b/tests/unit/stack/intrusive_stack_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_INTRUSIVE_STACK_DEFS_H
-#define __CDSUNIT_INTRUSIVE_STACK_DEFS_H
+#ifndef CDSUNIT_INTRUSIVE_STACK_DEFS_H
+#define CDSUNIT_INTRUSIVE_STACK_DEFS_H
 
 #define CDSUNIT_DECLARE_TreiberStack \
     TEST_CASE( Treiber_HP, cds::intrusive::treiber_stack::node< cds::gc::HP >        ) \
@@ -138,4 +138,4 @@
     CPPUNIT_TEST( StdStack_List_Mutex   ) \
     CPPUNIT_TEST( StdStack_List_Spin    )
 
-#endif // #ifndef __CDSUNIT_INTRUSIVE_STACK_DEFS_H
+#endif // #ifndef CDSUNIT_INTRUSIVE_STACK_DEFS_H

diff --git a/tests/unit/stack/intrusive_stack_type.h b/tests/unit/stack/intrusive_stack_type.h
index e49fbebf4bc5b0f541a386457d847f1b8a799bb9..9898180d35729ebcaadea85f131b28ed28a141c8 100644 (file)
--- a/tests/unit/stack/intrusive_stack_type.h
+++ b/tests/unit/stack/intrusive_stack_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_INTRUSIVE_STACK_TYPES_H
-#define __CDSUNIT_INTRUSIVE_STACK_TYPES_H
+#ifndef CDSUNIT_INTRUSIVE_STACK_TYPES_H
+#define CDSUNIT_INTRUSIVE_STACK_TYPES_H
 
 #include <cds/intrusive/treiber_stack.h>
 #include <cds/intrusive/fcstack.h>
@@ -393,4 +393,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __CDSUNIT_INTRUSIVE_STACK_TYPES_H
+#endif // #ifndef CDSUNIT_INTRUSIVE_STACK_TYPES_H

diff --git a/tests/unit/stack/stack_defs.h b/tests/unit/stack/stack_defs.h
index cce699e53bd6f507f6dafb29ca31b01bfa3162ee..3524437c1993b22504657dd1e62d1d09c36cb0c7 100644 (file)
--- a/tests/unit/stack/stack_defs.h
+++ b/tests/unit/stack/stack_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STACK_DEFS_H
-#define __CDSUNIT_STACK_DEFS_H
+#ifndef CDSUNIT_STACK_DEFS_H
+#define CDSUNIT_STACK_DEFS_H
 
 #define CDSUNIT_DECLARE_TreiberStack \
     TEST_CASE( Treiber_HP        ) \
@@ -164,4 +164,4 @@
     CPPUNIT_TEST( StdStack_List_Mutex   ) \
     CPPUNIT_TEST( StdStack_List_Spin    )
 
-#endif // #ifndef __CDSUNIT_STACK_DEFS_H
+#endif // #ifndef CDSUNIT_STACK_DEFS_H

diff --git a/tests/unit/stack/stack_type.h b/tests/unit/stack/stack_type.h
index 7fd2fee4be1a5515df80fbdfae6d5195b5accda8..e27622b673478b9268eea4d0232c59fb9d746db7 100644 (file)
--- a/tests/unit/stack/stack_type.h
+++ b/tests/unit/stack/stack_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STACK_TYPES_H
-#define __CDSUNIT_STACK_TYPES_H
+#ifndef CDSUNIT_STACK_TYPES_H
+#define CDSUNIT_STACK_TYPES_H
 
 #include <cds/container/treiber_stack.h>
 #include <cds/container/fcstack.h>
@@ -470,4 +470,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __CDSUNIT_STACK_TYPES_H
+#endif // #ifndef CDSUNIT_STACK_TYPES_H