Skip to content

Commit 3cbd5da

Browse files
authored
Merge pull request #32 from DNedic/optional_function_overloads
feat(): Use function overloads for std::optional API
2 parents fcb1f54 + 95e571e commit 3cbd5da

File tree

16 files changed

+18
-20
lines changed

16 files changed

+18
-20
lines changed

docs/mpmc/priority_queue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (read_success) {
3030

3131
There is also a `std::optional` API for `Pop`:
3232
```c
33-
auto read = queue_events.PopOptional();
33+
auto read = queue_events.Pop();
3434

3535
if (read) {
3636
actor2.ProcessEvent(read);

docs/mpmc/queue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (read_success) {
3030

3131
There is also a `std::optional` API for the `Pop` method:
3232
```c
33-
auto job = queue_jobs.PopOptional();
33+
auto job = queue_jobs.Pop();
3434

3535
if (job) {
3636
worker.ProcessJob(read);

docs/spsc/priority_queue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (read_success) {
3030

3131
There is also a `std::optional` API for `Pop`:
3232
```c
33-
auto read = queue_events.PopOptional();
33+
auto read = queue_events.Pop();
3434

3535
if (read) {
3636
actor2.ProcessEvent(read);

docs/spsc/queue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (read_success) {
3030

3131
There is also a `std::optional` API for the `Pop` method:
3232
```c
33-
auto read = queue_adc.PopOptional();
33+
auto read = queue_adc.Pop();
3434

3535
if (read) {
3636
DoStuffWithData(read);

lockfree/mpmc/priority_queue.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ template <typename T, size_t size, size_t priority_count> class PriorityQueue {
8383
* Should only be called from the consumer thread.
8484
* @retval Either the element or nothing if the queue is empty.
8585
*/
86-
std::optional<T> PopOptional();
86+
std::optional<T> Pop();
8787
#endif
8888

8989
/********************** PRIVATE MEMBERS ***********************/

lockfree/mpmc/priority_queue_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ bool PriorityQueue<T, size, priority_count>::Pop(T &element) {
6868
/********************* std::optional API **********************/
6969
#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
7070
template <typename T, size_t size, size_t priority_count>
71-
std::optional<T> PriorityQueue<T, size, priority_count>::PopOptional() {
71+
std::optional<T> PriorityQueue<T, size, priority_count>::Pop() {
7272
T element;
7373
bool result = Pop(element);
7474

lockfree/mpmc/queue.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ template <typename T, size_t size> class Queue {
8080
* @brief Removes an element from the queue.
8181
* @retval Either the element or nothing
8282
*/
83-
std::optional<T> PopOptional();
83+
std::optional<T> Pop();
8484
#endif
8585

8686
/*********************** PRIVATE TYPES ************************/

lockfree/mpmc/queue_impl.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ template <typename T, size_t size> bool Queue<T, size>::Pop(T &element) {
113113

114114
/********************* std::optional API **********************/
115115
#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
116-
template <typename T, size_t size>
117-
std::optional<T> Queue<T, size>::PopOptional() {
116+
template <typename T, size_t size> std::optional<T> Queue<T, size>::Pop() {
118117
T element;
119118
bool result = Pop(element);
120119

lockfree/spsc/priority_queue.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ template <typename T, size_t size, size_t priority_count> class PriorityQueue {
8484
* Should only be called from the consumer thread.
8585
* @retval Either the element or nothing if the queue is empty.
8686
*/
87-
std::optional<T> PopOptional();
87+
std::optional<T> Pop();
8888
#endif
8989

9090
/********************** PRIVATE MEMBERS ***********************/

lockfree/spsc/priority_queue_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ bool PriorityQueue<T, size, priority_count>::Pop(T &element) {
6969
/********************* std::optional API **********************/
7070
#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
7171
template <typename T, size_t size, size_t priority_count>
72-
std::optional<T> PriorityQueue<T, size, priority_count>::PopOptional() {
72+
std::optional<T> PriorityQueue<T, size, priority_count>::Pop() {
7373
T element;
7474
bool result = Pop(element);
7575

0 commit comments

Comments
 (0)