aboutsummaryrefslogtreecommitdiff
path: root/src/threading/thread.h
diff options
context:
space:
mode:
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>2020-11-04 16:44:42 +0100
committerGitHub <noreply@github.com>2020-11-04 16:44:42 +0100
commit5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch)
treec980d614fec4a5495798be3e79e033229062c3cd /src/threading/thread.h
parent28f6a79706b088c37268a59d90878220dc4ef9c7 (diff)
parent3af10766fd2b58b068e970266724d7eb10e9316b (diff)
downloaddragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz
Merge branch 'master' into master
Diffstat (limited to 'src/threading/thread.h')
-rw-r--r--src/threading/thread.h25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/threading/thread.h b/src/threading/thread.h
index cea92226f..aee2aa357 100644
--- a/src/threading/thread.h
+++ b/src/threading/thread.h
@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
#include <mutex>
#ifdef _AIX
- #include <sys/thread.h> // for tid_t
+#include <sys/thread.h> // for tid_t
#endif
/*
@@ -41,18 +41,17 @@ DEALINGS IN THE SOFTWARE.
* even divisions between the minimum and maximum reported thread priority.
*/
#if !defined(_WIN32)
- #define THREAD_PRIORITY_LOWEST 0
- #define THREAD_PRIORITY_BELOW_NORMAL 1
- #define THREAD_PRIORITY_NORMAL 2
- #define THREAD_PRIORITY_ABOVE_NORMAL 3
- #define THREAD_PRIORITY_HIGHEST 4
+#define THREAD_PRIORITY_LOWEST 0
+#define THREAD_PRIORITY_BELOW_NORMAL 1
+#define THREAD_PRIORITY_NORMAL 2
+#define THREAD_PRIORITY_ABOVE_NORMAL 3
+#define THREAD_PRIORITY_HIGHEST 4
#endif
-
-
-class Thread {
+class Thread
+{
public:
- Thread(const std::string &name="");
+ Thread(const std::string &name = "");
virtual ~Thread();
DISABLE_CLASS_COPY(Thread)
@@ -141,7 +140,9 @@ protected:
private:
std::thread::native_handle_type getThreadHandle()
- { return m_thread_obj->native_handle(); }
+ {
+ return m_thread_obj->native_handle();
+ }
static void threadProc(Thread *thr);
@@ -154,11 +155,9 @@ private:
std::thread *m_thread_obj = nullptr;
-
#ifdef _AIX
// For AIX, there does not exist any mapping from pthread_t to tid_t
// available to us, so we maintain one ourselves. This is set on thread start.
tid_t m_kernel_thread_id;
#endif
};
-