From eded65bbcabd8e2267ef3a1d7df467ab403b27e0 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 29 Jul 2021 15:55:09 +0200 Subject: to rebase --- compat/mutex.cpp | 33 --------------------------------- compat/mutex.hpp | 24 ------------------------ 2 files changed, 57 deletions(-) delete mode 100644 compat/mutex.cpp delete mode 100644 compat/mutex.hpp (limited to 'compat') diff --git a/compat/mutex.cpp b/compat/mutex.cpp deleted file mode 100644 index 664677ea..00000000 --- a/compat/mutex.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "mutex.hpp" -#include - -mutex& mutex::operator=(const mutex& rhs) -{ - if (rhs->isRecursive() != inner.isRecursive()) - std::abort(); - - return *this; -} - -mutex::mutex(const mutex& datum) : mutex{datum.inner.isRecursive() ? Recursive : NonRecursive} -{ -} - -mutex::mutex(RecursionMode m) : inner{m} -{ -} - -QMutex* mutex::operator&() const noexcept -{ - return &inner; -} - -mutex::operator QMutex*() const noexcept -{ - return &inner; -} - -QMutex* mutex::operator->() const noexcept -{ - return &inner; -} diff --git a/compat/mutex.hpp b/compat/mutex.hpp deleted file mode 100644 index 54758a08..00000000 --- a/compat/mutex.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include - -#include "export.hpp" - -class OTR_COMPAT_EXPORT mutex -{ - mutable QMutex inner; - -public: - using RecursionMode = QMutex::RecursionMode; - static constexpr RecursionMode Recursive = RecursionMode::Recursive; - static constexpr RecursionMode NonRecursive = RecursionMode::NonRecursive; - - mutex& operator=(const mutex& datum); - mutex(const mutex& datum); - explicit mutex(RecursionMode m); - mutex() : mutex{NonRecursive} {} - - QMutex* operator&() const noexcept; - explicit operator QMutex*() const noexcept; - QMutex* operator->() const noexcept; -}; -- cgit v1.2.3