projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix doxygen config
[libcds.git]
/
cds
/
intrusive
/
vyukov_mpmc_cycle_queue.h
diff --git
a/cds/intrusive/vyukov_mpmc_cycle_queue.h
b/cds/intrusive/vyukov_mpmc_cycle_queue.h
index 1b049bf511162f0d4e1d72a6d5b83ea792bbfba5..9355e0e04f09f13a26d63aab6fcc37386b9b682b 100644
(file)
--- a/
cds/intrusive/vyukov_mpmc_cycle_queue.h
+++ b/
cds/intrusive/vyukov_mpmc_cycle_queue.h
@@
-54,12
+54,12
@@
namespace cds { namespace intrusive {
\endcode
*/
\endcode
*/
- template <typename T,
CDS_DECL_OPTIONS6
>
+ template <typename T,
typename... Options
>
class VyukovMPMCCycleQueue
class VyukovMPMCCycleQueue
- : private container::VyukovMPMCCycleQueue< T *,
CDS_OPTIONS6
>
+ : private container::VyukovMPMCCycleQueue< T *,
Options...
>
{
//@cond
{
//@cond
- typedef container::VyukovMPMCCycleQueue< T *,
CDS_OPTIONS6
> base_class;
+ typedef container::VyukovMPMCCycleQueue< T *,
Options...
> base_class;
//@endcond
public:
typedef T value_type ; ///< type of data stored in the queue
//@endcond
public:
typedef T value_type ; ///< type of data stored in the queue
@@
-73,9
+73,9
@@
namespace cds { namespace intrusive {
public:
/// Rebind template arguments
public:
/// Rebind template arguments
- template <typename T2,
CDS_DECL_OTHER_OPTIONS6
>
+ template <typename T2,
typename... Options2
>
struct rebind {
struct rebind {
- typedef VyukovMPMCCycleQueue< T2,
CDS_OTHER_OPTIONS6
> other ; ///< Rebinding result
+ typedef VyukovMPMCCycleQueue< T2,
Options2...
> other ; ///< Rebinding result
};
public:
};
public:
@@
-98,7
+98,7
@@
namespace cds { namespace intrusive {
/// Dequeues an item from queue
/**
/// Dequeues an item from queue
/**
- If queue is empty, returns \p
NULL
.
+ If queue is empty, returns \p
nullptr
.
*/
value_type * dequeue()
{
*/
value_type * dequeue()
{