Applied clang-format -i -style=file -assume-filename=cpp

include/gsl/gsl_thread
This commit is contained in:
Galik 2017-04-18 04:39:16 +01:00
parent a19d1b0964
commit 74a7ed4bc1

View File

@ -22,15 +22,15 @@
#include <thread> #include <thread>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #pragma warning(push)
// turn off some warnings that are noisy about our Expects statements // turn off some warnings that are noisy about our Expects statements
#pragma warning(disable : 4127) // conditional expression is constant #pragma warning(disable : 4127) // conditional expression is constant
// blanket turn off warnings from CppCoreCheck for now // blanket turn off warnings from CppCoreCheck for now
// so people aren't annoyed by them when running the tool. // so people aren't annoyed by them when running the tool.
// more targeted suppressions will be added in a future update to the GSL // more targeted suppressions will be added in a future update to the GSL
#pragma warning(disable : 26481 26482 26483 26485 26490 26491 26492 26493 26495) #pragma warning(disable : 26481 26482 26483 26485 26490 26491 26492 26493 26495)
#endif // _MSC_VER #endif // _MSC_VER
namespace gsl namespace gsl
@ -44,20 +44,35 @@ public:
detached_thread() noexcept = default; detached_thread() noexcept = default;
detached_thread(detached_thread const&) = delete; detached_thread(detached_thread const&) = delete;
detached_thread(detached_thread&& other): t(std::move(other.t)) {} detached_thread(detached_thread&& other) : t(std::move(other.t)) {}
detached_thread(std::thread const&) = delete; detached_thread(std::thread const&) = delete;
detached_thread(std::thread&& other) noexcept: t(std::move(other)) { if(t.joinable()) t.detach(); } detached_thread(std::thread&& other) noexcept : t(std::move(other))
{
if (t.joinable()) t.detach();
}
detached_thread& operator=(detached_thread const&) = delete; detached_thread& operator=(detached_thread const&) = delete;
detached_thread& operator=(detached_thread&& other) noexcept { t = std::move(other.t); return *this; } detached_thread& operator=(detached_thread&& other) noexcept
{
t = std::move(other.t);
return *this;
}
detached_thread& operator=(std::thread const&) = delete; detached_thread& operator=(std::thread const&) = delete;
detached_thread& operator=(std::thread&& other) noexcept { t = std::move(other); if(t.joinable()) t.detach(); return *this; } detached_thread& operator=(std::thread&& other) noexcept
{
t = std::move(other);
if (t.joinable()) t.detach();
return *this;
}
template<typename Callable, typename... Args> template <typename Callable, typename... Args>
explicit detached_thread(Callable&& f, Args&&... args) explicit detached_thread(Callable&& f, Args&&... args)
: t(std::forward<Callable>(f), std::forward<Args>(args)...) { t.detach(); } : t(std::forward<Callable>(f), std::forward<Args>(args)...)
{
t.detach();
}
bool joinable() const { return t.joinable(); } bool joinable() const { return t.joinable(); }
@ -67,7 +82,11 @@ public:
void join() { t.join(); } void join() { t.join(); }
void swap(detached_thread& other) noexcept { using std::swap; swap(t, other.t); } void swap(detached_thread& other) noexcept
{
using std::swap;
swap(t, other.t);
}
private: private:
std::thread t; std::thread t;
@ -87,22 +106,35 @@ public:
raii_thread() noexcept = default; raii_thread() noexcept = default;
raii_thread(raii_thread const&) = delete; raii_thread(raii_thread const&) = delete;
raii_thread(raii_thread&& other): t(std::move(other.t)) {} raii_thread(raii_thread&& other) : t(std::move(other.t)) {}
raii_thread(std::thread const&) = delete; raii_thread(std::thread const&) = delete;
raii_thread(std::thread&& other) noexcept: t(std::move(other)) {} raii_thread(std::thread&& other) noexcept : t(std::move(other)) {}
raii_thread& operator=(raii_thread const&) = delete; raii_thread& operator=(raii_thread const&) = delete;
raii_thread& operator=(raii_thread&& other) noexcept { t = std::move(other.t); return *this; } raii_thread& operator=(raii_thread&& other) noexcept
{
t = std::move(other.t);
return *this;
}
raii_thread& operator=(std::thread const&) = delete; raii_thread& operator=(std::thread const&) = delete;
raii_thread& operator=(std::thread&& other) noexcept { t = std::move(other); return *this; } raii_thread& operator=(std::thread&& other) noexcept
{
t = std::move(other);
return *this;
}
template<typename Callable, typename... Args> template <typename Callable, typename... Args>
explicit raii_thread(Callable&& f, Args&&... args) explicit raii_thread(Callable&& f, Args&&... args)
: t(std::forward<Callable>(f), std::forward<Args>(args)...) {} : t(std::forward<Callable>(f), std::forward<Args>(args)...)
{
}
~raii_thread() { if(t.joinable()) t.join(); } ~raii_thread()
{
if (t.joinable()) t.join();
}
bool joinable() const { return t.joinable(); } bool joinable() const { return t.joinable(); }
@ -112,7 +144,11 @@ public:
void join() { t.join(); } void join() { t.join(); }
void swap(raii_thread& other) noexcept { using std::swap; swap(t, other.t); } void swap(raii_thread& other) noexcept
{
using std::swap;
swap(t, other.t);
}
private: private:
std::thread t; std::thread t;
@ -127,7 +163,7 @@ void swap(raii_thread& t1, raii_thread& t2) noexcept
} // namespace gsl } // namespace gsl
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif // _MSC_VER #endif // _MSC_VER
#endif // GSL_THREAD_H #endif // GSL_THREAD_H