Skip to content

Use standard std::shared_lock for C++14 #1651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mykolamalik merged 1 commit into from
Dec 28, 2025
Merged

Use standard std::shared_lock for C++14 #1651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions olp-cpp-sdk-core/include/olp/core/porting/shared_mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,24 @@
#endif

#ifndef THROW_OR_ABORT
# if __cpp_exceptions
# define THROW_OR_ABORT(exception) (throw (exception))
# else
# include <cstdlib>
# define THROW_OR_ABORT(exception) \
do { \
(void)exception; \
std::abort(); \
} while (0)
# endif
#if __cpp_exceptions
#define THROW_OR_ABORT(exception) (throw(exception))
#else
#include <cstdlib>
#define THROW_OR_ABORT(exception) \
do { \
(void)exception; \
std::abort(); \
} while (0)
#endif
#endif

namespace std {
namespace detail {

// C++11 compatible std::exchange
template<class T, class U = T>
T
exchange(T& obj, U&& new_value)
{
template <class T, class U = T>
T exchange(T& obj, U&& new_value) {
T old_value = std::move(obj);
obj = std::forward<U>(new_value);
return old_value;
Expand Down Expand Up @@ -341,6 +339,15 @@ class shared_mutex {
#endif
};

} // namespace std

// `std::shared_lock` is available since C++14
#if ((__cplusplus >= 201402L) || (defined(_MSC_VER) && _MSC_VER >= 1900))
#include <shared_mutex>
#else

namespace std {

template <typename Mutex>
/**
* @brief A shared mutex wrapper that supports timed lock operations
Expand Down Expand Up @@ -556,6 +563,7 @@ void swap(shared_lock<_Mutex>& __x, shared_lock<_Mutex>& __y) noexcept {
}

} // namespace std
#endif

#if defined(HAVE_PTHREAD_RWLOCK)
#undef HAVE_PTHREAD_RWLOCK
Expand Down
Loading