From 1b6a84a7821170fdafaca7ee52edc12e0546e00c Mon Sep 17 00:00:00 2001 From: khizmax Date: Fri, 19 Sep 2014 12:51:34 +0400 Subject: [PATCH] Changed cds_std namespace to std, removed cds/details/std directory, use STL headers instead --- cds/algo/backoff_strategy.h | 7 ++-- cds/algo/flat_combining.h | 12 +++--- cds/details/defs.h | 33 ---------------- cds/details/std/chrono.h | 24 ------------ cds/details/std/condition_variable.h | 26 ------------- cds/details/std/mutex.h | 39 ------------------- cds/intrusive/cuckoo_set.h | 11 +++--- cds/intrusive/segmented_queue.h | 4 +- cds/intrusive/striped_set/striping_policy.h | 14 +++---- cds/urcu/details/gpb.h | 5 +-- cds/urcu/details/gpi.h | 5 +-- cds/urcu/details/gpt.h | 2 +- cds/urcu/details/sig_buffered.h | 5 +-- cds/urcu/details/sig_threaded.h | 2 +- cds/urcu/dispose_thread.h | 10 ++--- cds/urcu/general_buffered.h | 2 +- cds/urcu/general_instant.h | 2 +- cds/urcu/general_threaded.h | 2 +- cds/urcu/signal_buffered.h | 2 +- cds/urcu/signal_threaded.h | 2 +- projects/Win/vc12/cds.vcxproj | 3 -- projects/Win/vc12/cds.vcxproj.filters | 12 ------ tests/test-hdr/deque/hdr_fcdeque.cpp | 4 +- .../priority_queue/hdr_fcpqueue_deque.cpp | 2 +- .../priority_queue/hdr_fcpqueue_vector.cpp | 2 +- .../hdr_intrusive_mspqueue_dyn.cpp | 4 +- .../hdr_intrusive_mspqueue_static.cpp | 4 +- .../priority_queue/hdr_mspqueue_dyn.cpp | 4 +- .../priority_queue/hdr_mspqueue_static.cpp | 4 +- tests/test-hdr/queue/hdr_fcqueue.cpp | 4 +- .../test-hdr/queue/hdr_intrusive_fcqueue.cpp | 4 +- .../hdr_intrusive_segmented_queue_hp.cpp | 2 +- .../hdr_intrusive_segmented_queue_ptb.cpp | 2 +- .../test-hdr/queue/hdr_segmented_queue_hp.cpp | 2 +- .../queue/hdr_segmented_queue_ptb.cpp | 2 +- .../test-hdr/stack/hdr_intrusive_fcstack.cpp | 4 +- tests/unit/pqueue/pqueue_type.h | 10 ++--- tests/unit/queue/intrusive_queue_type.h | 10 ++--- tests/unit/queue/queue_type.h | 10 ++--- tests/unit/stack/intrusive_stack_type.h | 16 ++++---- tests/unit/stack/stack_type.h | 14 +++---- 41 files changed, 92 insertions(+), 236 deletions(-) delete mode 100644 cds/details/std/chrono.h delete mode 100644 cds/details/std/condition_variable.h delete mode 100644 cds/details/std/mutex.h diff --git a/cds/algo/backoff_strategy.h b/cds/algo/backoff_strategy.h index fd02f659..a4f99072 100644 --- a/cds/algo/backoff_strategy.h +++ b/cds/algo/backoff_strategy.h @@ -17,8 +17,9 @@ */ #include +#include +#include #include -#include namespace cds { /// Different backoff schemes @@ -341,7 +342,7 @@ namespace cds { \endcode */ - template + template class delay { public: @@ -399,7 +400,7 @@ namespace cds { The declaration cds::backoff::delay_of< 5 > bkoff is equal for cds::backoff::delay<> bkoff(5). */ - template + template class delay_of: public delay { //@cond diff --git a/cds/algo/flat_combining.h b/cds/algo/flat_combining.h index 4c707816..9663d39d 100644 --- a/cds/algo/flat_combining.h +++ b/cds/algo/flat_combining.h @@ -3,11 +3,11 @@ #ifndef __CDS_ALGO_FLAT_COMBINING_H #define __CDS_ALGO_FLAT_COMBINING_H +#include #include #include #include #include -#include // lock_guard #include #include #include // thread_specific_ptr @@ -259,7 +259,7 @@ namespace cds { namespace algo { protected: //@cond typedef cds::details::Allocator< publication_record_type, allocator > cxx11_allocator; ///< internal helper cds::details::Allocator - typedef cds_std::lock_guard lock_guard; + typedef std::lock_guard lock_guard; //@endcond protected: @@ -596,7 +596,7 @@ namespace cds { namespace algo { { if ( m_Mutex.try_lock() ) { // The thread becomes a combiner - lock_guard l( m_Mutex, cds_std::adopt_lock_t() ); + lock_guard l( m_Mutex, std::adopt_lock_t() ); // The record pRec can be excluded from publication list. Re-publish it republish( pRec ); @@ -608,7 +608,7 @@ namespace cds { namespace algo { // There is another combiner, wait while it executes our request if ( !wait_for_combining( pRec ) ) { // The thread becomes a combiner - lock_guard l( m_Mutex, cds_std::adopt_lock_t() ); + lock_guard l( m_Mutex, std::adopt_lock_t() ); // The record pRec can be excluded from publication list. Re-publish it republish( pRec ); @@ -624,7 +624,7 @@ namespace cds { namespace algo { { if ( m_Mutex.try_lock() ) { // The thread becomes a combiner - lock_guard l( m_Mutex, cds_std::adopt_lock_t() ); + lock_guard l( m_Mutex, std::adopt_lock_t() ); // The record pRec can be excluded from publication list. Re-publish it republish( pRec ); @@ -636,7 +636,7 @@ namespace cds { namespace algo { // There is another combiner, wait while it executes our request if ( !wait_for_combining( pRec ) ) { // The thread becomes a combiner - lock_guard l( m_Mutex, cds_std::adopt_lock_t() ); + lock_guard l( m_Mutex, std::adopt_lock_t() ); // The record pRec can be excluded from publication list. Re-publish it republish( pRec ); diff --git a/cds/details/defs.h b/cds/details/defs.h index d6dc4d0c..7260b893 100644 --- a/cds/details/defs.h +++ b/cds/details/defs.h @@ -464,39 +464,6 @@ namespace cds { } // namespace cds -/// @defgroup cds_cxx11_stdlib_wrapper New C++11 standard library support - -/// C++11 standard library wrapper namespace -/** @ingroup cds_cxx11_stdlib_wrapper - libcds needs support from new features defined in C++11 standard library. - In case when an old compiler and corresponding \p std library has no required feature - the \p boost library is used if possible. The \p %cds_std namespace is a wrapper for new C++11 stdlib classes: - - if the compiler supports new feature, this feature places (with \p using directive) into \p %cds_std namespace "as is" - - otherwise the \p boost analog is used and it places into \p %cds_std namespace too - - For example, for class \p std::mutex the \p libcds does the following: - - for old compiler: \code - #include - namespace cds_std { - using boost::mutex; - } - \endcode - - for C++11-ready compiler: \code - #include - namespace cds_std { - using std::mutex; - } - \endcode - - Everywhere in \p libcds the class \p %cds_std::mutex is used instead of \p std::mutex. - - Note, not all C++11 features are contained in \p %cds_std but only required by \p libcds. - - In future when all compilers will be C++11-ready we can transform the \p libcds - to new C++11 standard library changing \p %cds_std namespace to native \p std. -*/ -namespace cds_std {} - //@cond #ifdef _DEBUG # define cds_assert(X) assert(X) diff --git a/cds/details/std/chrono.h b/cds/details/std/chrono.h deleted file mode 100644 index 3c045aad..00000000 --- a/cds/details/std/chrono.h +++ /dev/null @@ -1,24 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_DETAILS_STD_CHRONO_H -#define __CDS_DETAILS_STD_CHRONO_H - -//@cond - -#include - -#ifdef CDS_CXX11_STDLIB_CHRONO -# include -namespace cds_std { - namespace chrono = std::chrono; -} -#else -# include -namespace cds_std { - namespace chrono = boost::chrono; -} -#endif - -//@endcond - -#endif // #ifndef __CDS_DETAILS_STD_CHRONO_H diff --git a/cds/details/std/condition_variable.h b/cds/details/std/condition_variable.h deleted file mode 100644 index 5db1e2fa..00000000 --- a/cds/details/std/condition_variable.h +++ /dev/null @@ -1,26 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_DETAILS_STD_CONDITION_VARIABLE_H -#define __CDS_DETAILS_STD_CONDITION_VARIABLE_H - -//@cond - -#include - -#ifdef CDS_CXX11_STDLIB_CONDITION_VARIABLE -# include - namespace cds_std { - using std::condition_variable; - using std::condition_variable_any; - } -#else -# include - namespace cds_std { - using boost::condition_variable; - using boost::condition_variable_any; - } -#endif - -//@endcond - -#endif // #ifndef __CDS_DETAILS_STD_CONDITION_VARIABLE_H diff --git a/cds/details/std/mutex.h b/cds/details/std/mutex.h deleted file mode 100644 index 7bd3533c..00000000 --- a/cds/details/std/mutex.h +++ /dev/null @@ -1,39 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_DETAILS_STD_MUTEX_H -#define __CDS_DETAILS_STD_MUTEX_H - -//@cond - -#include - -#ifdef CDS_CXX11_STDLIB_MUTEX -# include - namespace cds_std { - using std::mutex; - using std::recursive_mutex; - using std::unique_lock; - using std::lock_guard; - using std::adopt_lock_t; - } -#else -# include -# include -# if BOOST_VERSION >= 105300 -# include -# include -# else -# include -# endif - namespace cds_std { - using boost::mutex; - using boost::recursive_mutex; - using boost::unique_lock; - using boost::lock_guard; - using boost::adopt_lock_t; - } -#endif - -//@endcond - -#endif // #ifndef __CDS_DETAILS_STD_MUTEX_H diff --git a/cds/intrusive/cuckoo_set.h b/cds/intrusive/cuckoo_set.h index 3a36a98a..dd07159d 100644 --- a/cds/intrusive/cuckoo_set.h +++ b/cds/intrusive/cuckoo_set.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -14,8 +15,6 @@ #include #include -#include -//#include namespace cds { namespace intrusive { @@ -347,7 +346,7 @@ namespace cds { namespace intrusive { The policy contains an internal array of \p RecursiveLock locks. Template arguments: - - \p RecursiveLock - the type of recursive mutex. The default is \p cds_std::recursive_mutex. The mutex type should be default-constructible. + - \p RecursiveLock - the type of recursive mutex. The default is \p std::recursive_mutex. The mutex type should be default-constructible. Note that a recursive spin-lock is not suitable for lock striping for performance reason. - \p Arity - unsigned int constant that specifies an arity. The arity is the count of hash functors, i.e., the count of lock arrays. Default value is 2. @@ -356,7 +355,7 @@ namespace cds { namespace intrusive { class according to its \p opt::stat option. */ template < - class RecursiveLock = cds_std::recursive_mutex, + class RecursiveLock = std::recursive_mutex, unsigned int Arity = 2, class Alloc = CDS_DEFAULT_ALLOCATOR, class Stat = empty_striping_stat @@ -597,7 +596,7 @@ namespace cds { namespace intrusive { Template arguments: - \p RecursiveLock - the type of mutex. Reentrant (recursive) mutex is required. - The default is \p cds_std::recursive_mutex. The mutex type should be default-constructible. + The default is \p std::recursive_mutex. The mutex type should be default-constructible. - \p Arity - unsigned int constant that specifies an arity. The arity is the count of hash functors, i.e., the count of lock arrays. Default value is 2. - \p BackOff - back-off strategy. Default is cds::backoff::yield @@ -606,7 +605,7 @@ namespace cds { namespace intrusive { class according to its \p opt::stat option. */ template < - class RecursiveLock = cds_std::recursive_mutex, + class RecursiveLock = std::recursive_mutex, unsigned int Arity = 2, typename BackOff = cds::backoff::yield, class Alloc = CDS_DEFAULT_ALLOCATOR, diff --git a/cds/intrusive/segmented_queue.h b/cds/intrusive/segmented_queue.h index 18a9d45a..05ff51c4 100644 --- a/cds/intrusive/segmented_queue.h +++ b/cds/intrusive/segmented_queue.h @@ -3,10 +3,10 @@ #ifndef __CDS_INTRUSIVE_SEGMENTED_QUEUE_H #define __CDS_INTRUSIVE_SEGMENTED_QUEUE_H +#include #include #include #include -#include #include #include @@ -242,7 +242,7 @@ namespace cds { namespace intrusive { class segment_list { typedef boost::intrusive::slist< segment, boost::intrusive::cache_last< true > > list_impl; - typedef cds_std::unique_lock< lock_type > scoped_lock; + typedef std::unique_lock< lock_type > scoped_lock; aligned_segment_ptr m_pHead; aligned_segment_ptr m_pTail; diff --git a/cds/intrusive/striped_set/striping_policy.h b/cds/intrusive/striped_set/striping_policy.h index 579563c0..1e3ec4c3 100644 --- a/cds/intrusive/striped_set/striping_policy.h +++ b/cds/intrusive/striped_set/striping_policy.h @@ -4,15 +4,11 @@ #define __CDS_INTRUSIVE_STRIPED_SET_STRIPING_POLICY_H #include +#include #include #include #include -#include -//#include -//#include - - namespace cds { namespace intrusive { namespace striped_set { /// Lock striping concurrent access policy @@ -29,11 +25,11 @@ namespace cds { namespace intrusive { namespace striped_set { The policy contains an internal array of \p Lock locks. Template arguments: - - \p Lock - the type of mutex. The default is \p cds_std::mutex. The mutex type should be default-constructible. + - \p Lock - the type of mutex. The default is \p std::mutex. The mutex type should be default-constructible. Note that a spin-lock is not so good suitable for lock striping for performance reason. - \p Alloc - allocator type used for lock array memory allocation. Default is \p CDS_DEFAULT_ALLOCATOR. */ - template + template class striping { public: @@ -113,12 +109,12 @@ namespace cds { namespace intrusive { namespace striped_set { Template arguments: - \p RecursiveLock - the type of mutex. Reentrant (recursive) mutex is required. - The default is \p cds_std::recursive_mutex. The mutex type should be default-constructible. + The default is \p std::recursive_mutex. The mutex type should be default-constructible. - \p BackOff - back-off strategy. Default is cds::backoff::yield - \p Alloc - allocator type used for lock array memory allocation. Default is \p CDS_DEFAULT_ALLOCATOR. */ template < - class RecursiveLock = cds_std::recursive_mutex, + class RecursiveLock = std::recursive_mutex, typename BackOff = cds::backoff::yield, class Alloc = CDS_DEFAULT_ALLOCATOR> class refinable diff --git a/cds/urcu/details/gpb.h b/cds/urcu/details/gpb.h index b5d85b49..e75ada61 100644 --- a/cds/urcu/details/gpb.h +++ b/cds/urcu/details/gpb.h @@ -3,12 +3,11 @@ #ifndef _CDS_URCU_DETAILS_GPB_H #define _CDS_URCU_DETAILS_GPB_H +#include #include #include #include -#include - namespace cds { namespace urcu { /// User-space general-purpose RCU with deferred (buffered) reclamation @@ -44,7 +43,7 @@ namespace cds { namespace urcu { epoch_retired_ptr ,cds::opt::buffer< cds::opt::v::dynamic_buffer< epoch_retired_ptr > > > - ,class Lock = cds_std::mutex + ,class Lock = std::mutex ,class Backoff = cds::backoff::Default > class general_buffered: public details::gp_singleton< general_buffered_tag > diff --git a/cds/urcu/details/gpi.h b/cds/urcu/details/gpi.h index 2ab6553f..0f0de150 100644 --- a/cds/urcu/details/gpi.h +++ b/cds/urcu/details/gpi.h @@ -3,12 +3,11 @@ #ifndef _CDS_URCU_DETAILS_GPI_H #define _CDS_URCU_DETAILS_GPI_H +#include #include #include #include -#include - namespace cds { namespace urcu { /// User-space general-purpose RCU with immediate reclamation @@ -29,7 +28,7 @@ namespace cds { namespace urcu { - \p Backoff - back-off schema, default is cds::backoff::Default */ template < - class Lock = cds_std::mutex + class Lock = std::mutex ,class Backoff = cds::backoff::Default > class general_instant: public details::gp_singleton< general_instant_tag > diff --git a/cds/urcu/details/gpt.h b/cds/urcu/details/gpt.h index 994e50a6..2fb8e114 100644 --- a/cds/urcu/details/gpt.h +++ b/cds/urcu/details/gpt.h @@ -41,7 +41,7 @@ namespace cds { namespace urcu { epoch_retired_ptr ,cds::opt::buffer< cds::opt::v::dynamic_buffer< epoch_retired_ptr > > > - ,class Lock = cds_std::mutex + ,class Lock = std::mutex ,class DisposerThread = dispose_thread ,class Backoff = cds::backoff::Default > diff --git a/cds/urcu/details/sig_buffered.h b/cds/urcu/details/sig_buffered.h index 5ab1ad25..4f90037b 100644 --- a/cds/urcu/details/sig_buffered.h +++ b/cds/urcu/details/sig_buffered.h @@ -6,11 +6,10 @@ #include #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED +#include #include #include -#include - namespace cds { namespace urcu { /// User-space signal-handled RCU with deferred (buffered) reclamation @@ -46,7 +45,7 @@ namespace cds { namespace urcu { epoch_retired_ptr ,cds::opt::buffer< cds::opt::v::dynamic_buffer< epoch_retired_ptr > > > - ,class Lock = cds_std::mutex + ,class Lock = std::mutex ,class Backoff = cds::backoff::Default > class signal_buffered: public details::sh_singleton< signal_buffered_tag > diff --git a/cds/urcu/details/sig_threaded.h b/cds/urcu/details/sig_threaded.h index 9056e894..dddcf595 100644 --- a/cds/urcu/details/sig_threaded.h +++ b/cds/urcu/details/sig_threaded.h @@ -43,7 +43,7 @@ namespace cds { namespace urcu { epoch_retired_ptr ,cds::opt::buffer< cds::opt::v::dynamic_buffer< epoch_retired_ptr > > > - ,class Lock = cds_std::mutex + ,class Lock = std::mutex ,class DisposerThread = dispose_thread ,class Backoff = cds::backoff::Default > diff --git a/cds/urcu/dispose_thread.h b/cds/urcu/dispose_thread.h index 9ebb4bd5..da220661 100644 --- a/cds/urcu/dispose_thread.h +++ b/cds/urcu/dispose_thread.h @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include #include namespace cds { namespace urcu { @@ -27,9 +27,9 @@ namespace cds { namespace urcu { private: //@cond typedef std::thread thread_type; - typedef cds_std::mutex mutex_type; - typedef cds_std::condition_variable condvar_type; - typedef cds_std::unique_lock< mutex_type > unique_lock; + typedef std::mutex mutex_type; + typedef std::condition_variable condvar_type; + typedef std::unique_lock< mutex_type > unique_lock; class dispose_thread_starter: public thread_type { diff --git a/cds/urcu/general_buffered.h b/cds/urcu/general_buffered.h index a68dfce2..4b042f0e 100644 --- a/cds/urcu/general_buffered.h +++ b/cds/urcu/general_buffered.h @@ -24,7 +24,7 @@ namespace cds { namespace urcu { retired_ptr ,cds::opt::buffer< cds::opt::v::dynamic_buffer< retired_ptr > > > - ,class Lock = cds_std::mutex + ,class Lock = std::mutex ,class Backoff = cds::backoff::Default #else class Buffer diff --git a/cds/urcu/general_instant.h b/cds/urcu/general_instant.h index 49f5cec3..c0c128cd 100644 --- a/cds/urcu/general_instant.h +++ b/cds/urcu/general_instant.h @@ -18,7 +18,7 @@ namespace cds { namespace urcu { */ template < #ifdef CDS_DOXGEN_INVOKED - class Lock = cds_std::mutex + class Lock = std::mutex ,class Backoff = cds::backoff::Default #else class Lock diff --git a/cds/urcu/general_threaded.h b/cds/urcu/general_threaded.h index 324017ff..57699ce1 100644 --- a/cds/urcu/general_threaded.h +++ b/cds/urcu/general_threaded.h @@ -27,7 +27,7 @@ namespace cds { namespace urcu { epoch_retired_ptr ,cds::opt::buffer< cds::opt::v::dynamic_buffer< epoch_retired_ptr > > > - ,class Lock = cds_std::mutex + ,class Lock = std::mutex ,class DisposerThread = dispose_thread ,class Backoff = cds::backoff::Default #else diff --git a/cds/urcu/signal_buffered.h b/cds/urcu/signal_buffered.h index 640606d4..0d26dfe4 100644 --- a/cds/urcu/signal_buffered.h +++ b/cds/urcu/signal_buffered.h @@ -25,7 +25,7 @@ namespace cds { namespace urcu { retired_ptr ,cds::opt::buffer< cds::opt::v::dynamic_buffer< retired_ptr > > > - ,class Lock = cds_std::mutex + ,class Lock = std::mutex ,class Backoff = cds::backoff::Default #else class Buffer diff --git a/cds/urcu/signal_threaded.h b/cds/urcu/signal_threaded.h index 68a3adf6..e8546b01 100644 --- a/cds/urcu/signal_threaded.h +++ b/cds/urcu/signal_threaded.h @@ -29,7 +29,7 @@ namespace cds { namespace urcu { epoch_retired_ptr ,cds::opt::buffer< cds::opt::v::dynamic_buffer< epoch_retired_ptr > > > - ,class Lock = cds_std::mutex + ,class Lock = std::mutex ,class DisposerThread = dispose_thread ,class Backoff = cds::backoff::Default #else diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index 0d665996..74b6c0e4 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -729,9 +729,6 @@ - - - diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index 5d3b6268..d0867397 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -124,9 +124,6 @@ {ae97048d-bd62-4ff2-be28-3c84338e7186} - - {e6c65d81-ad06-40f3-be4e-ddaab3295bf3} - {560b4d4c-71e1-443c-942e-dcc5a275c7c2} @@ -1055,15 +1052,6 @@ Header Files\cds\container\details - - Header Files\cds\details\std - - - Header Files\cds\details\std - - - Header Files\cds\details\std - Header Files\cds\details diff --git a/tests/test-hdr/deque/hdr_fcdeque.cpp b/tests/test-hdr/deque/hdr_fcdeque.cpp index 11e72dd3..8d6042c3 100644 --- a/tests/test-hdr/deque/hdr_fcdeque.cpp +++ b/tests/test-hdr/deque/hdr_fcdeque.cpp @@ -115,7 +115,7 @@ namespace deque { typedef cds::container::FCDeque, cds::container::fcdeque::make_traits< cds::opt::enable_elimination< true > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type > deque_type; test(); @@ -152,7 +152,7 @@ namespace deque { typedef cds::container::FCDeque, cds::container::fcdeque::make_traits< cds::opt::enable_elimination< true > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type > deque_type; test(); diff --git a/tests/test-hdr/priority_queue/hdr_fcpqueue_deque.cpp b/tests/test-hdr/priority_queue/hdr_fcpqueue_deque.cpp index 8370f450..ea40261b 100644 --- a/tests/test-hdr/priority_queue/hdr_fcpqueue_deque.cpp +++ b/tests/test-hdr/priority_queue/hdr_fcpqueue_deque.cpp @@ -44,7 +44,7 @@ namespace priority_queue { ,std::deque > ,cds::container::fcpqueue::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type > pqueue_type; test_fcpqueue(); diff --git a/tests/test-hdr/priority_queue/hdr_fcpqueue_vector.cpp b/tests/test-hdr/priority_queue/hdr_fcpqueue_vector.cpp index 4b860b5e..613f2d64 100644 --- a/tests/test-hdr/priority_queue/hdr_fcpqueue_vector.cpp +++ b/tests/test-hdr/priority_queue/hdr_fcpqueue_vector.cpp @@ -33,7 +33,7 @@ namespace priority_queue { PQueueHdrTest::value_type ,std::priority_queue< PQueueHdrTest::value_type > ,cds::container::fcpqueue::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type > pqueue_type; test_fcpqueue(); diff --git a/tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_dyn.cpp b/tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_dyn.cpp index e588afdc..aeafd137 100644 --- a/tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_dyn.cpp +++ b/tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_dyn.cpp @@ -2,7 +2,7 @@ #include "priority_queue/hdr_intrusive_pqueue.h" #include -#include +#include namespace priority_queue { namespace intrusive_pqueue { @@ -70,7 +70,7 @@ namespace priority_queue { cds::intrusive::mspriority_queue::make_traits< cds::opt::buffer< buffer_type > ,cds::opt::compare< IntrusivePQueueHdrTest::compare > - ,cds::opt::lock_type + ,cds::opt::lock_type >::type > pqueue; diff --git a/tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_static.cpp b/tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_static.cpp index 37fcd8ec..450fbc1e 100644 --- a/tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_static.cpp +++ b/tests/test-hdr/priority_queue/hdr_intrusive_mspqueue_static.cpp @@ -2,7 +2,7 @@ #include "priority_queue/hdr_intrusive_pqueue.h" #include -#include +#include namespace priority_queue { namespace intrusive_pqueue { @@ -70,7 +70,7 @@ namespace priority_queue { cds::intrusive::mspriority_queue::make_traits< cds::opt::buffer< buffer_type > ,cds::opt::compare< IntrusivePQueueHdrTest::compare > - ,cds::opt::lock_type + ,cds::opt::lock_type >::type > pqueue; diff --git a/tests/test-hdr/priority_queue/hdr_mspqueue_dyn.cpp b/tests/test-hdr/priority_queue/hdr_mspqueue_dyn.cpp index cb6e6749..7a525cb8 100644 --- a/tests/test-hdr/priority_queue/hdr_mspqueue_dyn.cpp +++ b/tests/test-hdr/priority_queue/hdr_mspqueue_dyn.cpp @@ -2,7 +2,7 @@ #include "priority_queue/hdr_pqueue.h" #include -#include +#include namespace priority_queue { namespace pqueue { @@ -70,7 +70,7 @@ namespace priority_queue { cds::container::mspriority_queue::make_traits< cds::opt::buffer< buffer_type > ,cds::opt::compare< PQueueHdrTest::compare > - ,cds::opt::lock_type + ,cds::opt::lock_type >::type > pqueue; diff --git a/tests/test-hdr/priority_queue/hdr_mspqueue_static.cpp b/tests/test-hdr/priority_queue/hdr_mspqueue_static.cpp index e8ebbe38..726a8950 100644 --- a/tests/test-hdr/priority_queue/hdr_mspqueue_static.cpp +++ b/tests/test-hdr/priority_queue/hdr_mspqueue_static.cpp @@ -2,7 +2,7 @@ #include "priority_queue/hdr_pqueue.h" #include -#include +#include namespace priority_queue { namespace pqueue { @@ -70,7 +70,7 @@ namespace priority_queue { cds::container::mspriority_queue::make_traits< cds::opt::buffer< buffer_type > ,cds::opt::compare< PQueueHdrTest::compare > - ,cds::opt::lock_type + ,cds::opt::lock_type >::type > pqueue; diff --git a/tests/test-hdr/queue/hdr_fcqueue.cpp b/tests/test-hdr/queue/hdr_fcqueue.cpp index 4b2009df..ec76558d 100644 --- a/tests/test-hdr/queue/hdr_fcqueue.cpp +++ b/tests/test-hdr/queue/hdr_fcqueue.cpp @@ -27,7 +27,7 @@ namespace queue { { typedef cds::container::FCQueue >, cds::container::fcqueue::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type > queue_type; testFCQueue(); @@ -64,7 +64,7 @@ namespace queue { { typedef cds::container::FCQueue >, cds::container::fcqueue::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type > queue_type; testFCQueue(); diff --git a/tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp b/tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp index 74bfb20b..0769363c 100644 --- a/tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp +++ b/tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp @@ -198,7 +198,7 @@ namespace queue { cds::intrusive::fcqueue::make_traits< cds::intrusive::opt::disposer< disposer > ,cds::opt::enable_elimination< true > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type > queue_type; @@ -271,7 +271,7 @@ namespace queue { cds::intrusive::fcqueue::make_traits< cds::intrusive::opt::disposer< disposer > ,cds::opt::enable_elimination< true > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type > queue_type; diff --git a/tests/test-hdr/queue/hdr_intrusive_segmented_queue_hp.cpp b/tests/test-hdr/queue/hdr_intrusive_segmented_queue_hp.cpp index 5e838893..41264b72 100644 --- a/tests/test-hdr/queue/hdr_intrusive_segmented_queue_hp.cpp +++ b/tests/test-hdr/queue/hdr_intrusive_segmented_queue_hp.cpp @@ -22,7 +22,7 @@ namespace queue { typedef cds::intrusive::SegmentedQueue< cds::gc::HP, item, cds::intrusive::segmented_queue::make_traits< cds::intrusive::opt::disposer< Disposer > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type > queue_type; diff --git a/tests/test-hdr/queue/hdr_intrusive_segmented_queue_ptb.cpp b/tests/test-hdr/queue/hdr_intrusive_segmented_queue_ptb.cpp index 94166e67..aa43ae2c 100644 --- a/tests/test-hdr/queue/hdr_intrusive_segmented_queue_ptb.cpp +++ b/tests/test-hdr/queue/hdr_intrusive_segmented_queue_ptb.cpp @@ -22,7 +22,7 @@ namespace queue { typedef cds::intrusive::SegmentedQueue< cds::gc::PTB, item, cds::intrusive::segmented_queue::make_traits< cds::intrusive::opt::disposer< Disposer > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type > queue_type; diff --git a/tests/test-hdr/queue/hdr_segmented_queue_hp.cpp b/tests/test-hdr/queue/hdr_segmented_queue_hp.cpp index bcecfc01..b7f411be 100644 --- a/tests/test-hdr/queue/hdr_segmented_queue_hp.cpp +++ b/tests/test-hdr/queue/hdr_segmented_queue_hp.cpp @@ -17,7 +17,7 @@ namespace queue { { typedef cds::container::SegmentedQueue< cds::gc::HP, item, cds::container::segmented_queue::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type > queue_type; diff --git a/tests/test-hdr/queue/hdr_segmented_queue_ptb.cpp b/tests/test-hdr/queue/hdr_segmented_queue_ptb.cpp index 74788a15..6d8ad498 100644 --- a/tests/test-hdr/queue/hdr_segmented_queue_ptb.cpp +++ b/tests/test-hdr/queue/hdr_segmented_queue_ptb.cpp @@ -17,7 +17,7 @@ namespace queue { { typedef cds::container::SegmentedQueue< cds::gc::PTB, item, cds::container::segmented_queue::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type > queue_type; diff --git a/tests/test-hdr/stack/hdr_intrusive_fcstack.cpp b/tests/test-hdr/stack/hdr_intrusive_fcstack.cpp index f037411a..ebc2d248 100644 --- a/tests/test-hdr/stack/hdr_intrusive_fcstack.cpp +++ b/tests/test-hdr/stack/hdr_intrusive_fcstack.cpp @@ -146,7 +146,7 @@ namespace stack { typedef base_hook_item< boost::intrusive::slist_base_hook<> > value_type; typedef cds::intrusive::FCStack< value_type, boost::intrusive::slist< value_type >, cds::intrusive::fcstack::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type > stack_type; test(); @@ -223,7 +223,7 @@ namespace stack { typedef base_hook_item< boost::intrusive::list_base_hook<> > value_type; typedef cds::intrusive::FCStack< value_type, boost::intrusive::list< value_type >, cds::intrusive::fcstack::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type > stack_type; test(); diff --git a/tests/unit/pqueue/pqueue_type.h b/tests/unit/pqueue/pqueue_type.h index 79978616..4c5572f2 100644 --- a/tests/unit/pqueue/pqueue_type.h +++ b/tests/unit/pqueue/pqueue_type.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include "print_ellenbintree_stat.h" @@ -65,7 +65,7 @@ namespace pqueue { typedef cc::MSPriorityQueue< Value, typename cc::mspriority_queue::make_traits< co::buffer< co::v::static_buffer< char, c_nBoundedCapacity > > - ,co::lock_type + ,co::lock_type >::type > MSPriorityQueue_static_mutex; @@ -92,7 +92,7 @@ namespace pqueue { typedef cc::MSPriorityQueue< Value, typename cc::mspriority_queue::make_traits< co::buffer< co::v::dynamic_buffer< char > > - ,co::lock_type + ,co::lock_type >::type > MSPriorityQueue_dyn_mutex; @@ -444,9 +444,9 @@ namespace pqueue { /// Standard priority_queue typedef StdPQueue< Value, std::vector, cds::lock::Spin > StdPQueue_vector_spin; - typedef StdPQueue< Value, std::vector, cds_std::mutex > StdPQueue_vector_mutex; + typedef StdPQueue< Value, std::vector, std::mutex > StdPQueue_vector_mutex; typedef StdPQueue< Value, std::deque, cds::lock::Spin > StdPQueue_deque_spin; - typedef StdPQueue< Value, std::deque, cds_std::mutex > StdPQueue_deque_mutex; + typedef StdPQueue< Value, std::deque, std::mutex > StdPQueue_deque_mutex; }; diff --git a/tests/unit/queue/intrusive_queue_type.h b/tests/unit/queue/intrusive_queue_type.h index b9aaf981..23e9f08b 100644 --- a/tests/unit/queue/intrusive_queue_type.h +++ b/tests/unit/queue/intrusive_queue_type.h @@ -91,12 +91,12 @@ namespace queue { } }; - template + template class BoostSList { typedef boost::intrusive::slist< T, boost::intrusive::cache_last > slist_type; typedef Lock lock_type; - typedef cds_std::lock_guard lock_guard; + typedef std::lock_guard lock_guard; slist_type m_List; mutable lock_type m_Lock; @@ -569,12 +569,12 @@ namespace queue { class traits_SegmentedQueue_mutex_stat: public cds::intrusive::segmented_queue::make_traits< cds::opt::stat< cds::intrusive::segmented_queue::stat<> > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type {}; class traits_SegmentedQueue_mutex: public cds::intrusive::segmented_queue::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type {}; @@ -589,7 +589,7 @@ namespace queue { typedef cds::intrusive::SegmentedQueue< cds::gc::PTB, T, traits_SegmentedQueue_mutex_stat > SegmentedQueue_PTB_mutex_stat; // Boost SList - typedef details::BoostSList< T, cds_std::mutex > BoostSList_mutex; + typedef details::BoostSList< T, std::mutex > BoostSList_mutex; typedef details::BoostSList< T, cds::lock::Spin > BoostSList_spin; }; } diff --git a/tests/unit/queue/queue_type.h b/tests/unit/queue/queue_type.h index 7585e5b5..16dbc16d 100644 --- a/tests/unit/queue/queue_type.h +++ b/tests/unit/queue/queue_type.h @@ -703,7 +703,7 @@ namespace queue { {}; struct traits_FCDeque_mutex: public cds::container::fcdeque::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type {}; @@ -731,8 +731,8 @@ namespace queue { typedef StdQueue_deque StdQueue_deque_Spinlock; typedef StdQueue_list StdQueue_list_Spinlock; - typedef StdQueue_deque StdQueue_deque_BoostMutex; - typedef StdQueue_list StdQueue_list_BoostMutex; + typedef StdQueue_deque StdQueue_deque_BoostMutex; + typedef StdQueue_list StdQueue_list_BoostMutex; #ifdef UNIT_LOCK_WIN_CS typedef StdQueue_deque StdQueue_deque_WinCS; typedef StdQueue_list StdQueue_list_WinCS; @@ -749,12 +749,12 @@ namespace queue { class traits_SegmentedQueue_mutex_stat: public cds::container::segmented_queue::make_traits< cds::opt::stat< cds::intrusive::segmented_queue::stat<> > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type {}; class traits_SegmentedQueue_mutex: public cds::container::segmented_queue::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type {}; diff --git a/tests/unit/stack/intrusive_stack_type.h b/tests/unit/stack/intrusive_stack_type.h index 485c443c..14e40f64 100644 --- a/tests/unit/stack/intrusive_stack_type.h +++ b/tests/unit/stack/intrusive_stack_type.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include @@ -68,7 +68,7 @@ namespace istack { mutable Lock m_Lock; cds::intrusive::treiber_stack::empty_stat m_stat; - typedef cds_std::unique_lock unique_lock; + typedef std::unique_lock unique_lock; public: typedef T value_type; @@ -455,20 +455,20 @@ namespace istack { struct traits_FCStack_mutex_stat: public cds::intrusive::fcstack::make_traits< cds::opt::stat< cds::intrusive::fcstack::stat<> > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type {}; struct traits_FCStack_mutex_elimination: public cds::intrusive::fcstack::make_traits< cds::opt::enable_elimination< true > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type {}; struct traits_FCStack_mutex_elimination_stat: public cds::intrusive::fcstack::make_traits< cds::opt::stat< cds::intrusive::fcstack::stat<> > ,cds::opt::enable_elimination< true > - ,cds::opt::lock_type< cds_std::mutex > + ,cds::opt::lock_type< std::mutex > >::type {}; @@ -624,11 +624,11 @@ namespace istack { // std::stack - typedef details::StdStack< T, std::stack< T* >, cds_std::mutex > StdStack_Deque_Mutex; + typedef details::StdStack< T, std::stack< T* >, std::mutex > StdStack_Deque_Mutex; typedef details::StdStack< T, std::stack< T* >, cds::lock::Spin > StdStack_Deque_Spin; - typedef details::StdStack< T, std::stack< T*, std::vector >, cds_std::mutex > StdStack_Vector_Mutex; + typedef details::StdStack< T, std::stack< T*, std::vector >, std::mutex > StdStack_Vector_Mutex; typedef details::StdStack< T, std::stack< T*, std::vector >, cds::lock::Spin > StdStack_Vector_Spin; - typedef details::StdStack< T, std::stack< T*, std::list >, cds_std::mutex > StdStack_List_Mutex; + typedef details::StdStack< T, std::stack< T*, std::list >, std::mutex > StdStack_List_Mutex; typedef details::StdStack< T, std::stack< T*, std::list >, cds::lock::Spin > StdStack_List_Spin; }; diff --git a/tests/unit/stack/stack_type.h b/tests/unit/stack/stack_type.h index 1183c2fb..7a840a80 100644 --- a/tests/unit/stack/stack_type.h +++ b/tests/unit/stack/stack_type.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include @@ -120,7 +120,7 @@ namespace stack { mutable Lock m_Lock; cds::container::treiber_stack::empty_stat m_stat; - typedef cds_std::unique_lock unique_lock; + typedef std::unique_lock unique_lock; public: bool push( T const& v ) @@ -448,7 +448,7 @@ namespace stack { {}; struct traits_FCStack_mutex: public cds::container::fcstack::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type {}; @@ -486,7 +486,7 @@ namespace stack { {}; struct traits_FCDeque_mutex: public cds::container::fcdeque::make_traits< - cds::opt::lock_type< cds_std::mutex > + cds::opt::lock_type< std::mutex > >::type {}; @@ -613,11 +613,11 @@ namespace stack { // std::stack - typedef details::StdStack< T, std::stack< T >, cds_std::mutex > StdStack_Deque_Mutex; + typedef details::StdStack< T, std::stack< T >, std::mutex > StdStack_Deque_Mutex; typedef details::StdStack< T, std::stack< T >, cds::lock::Spin > StdStack_Deque_Spin; - typedef details::StdStack< T, std::stack< T, std::vector >, cds_std::mutex > StdStack_Vector_Mutex; + typedef details::StdStack< T, std::stack< T, std::vector >, std::mutex > StdStack_Vector_Mutex; typedef details::StdStack< T, std::stack< T, std::vector >, cds::lock::Spin > StdStack_Vector_Spin; - typedef details::StdStack< T, std::stack< T, std::list >, cds_std::mutex > StdStack_List_Mutex; + typedef details::StdStack< T, std::stack< T, std::list >, std::mutex > StdStack_List_Mutex; typedef details::StdStack< T, std::stack< T, std::list >, cds::lock::Spin > StdStack_List_Spin; }; -- 2.34.1