Revert "fix thread namespace"

This reverts commit 3ef2eeb8aa.
This commit is contained in:
max_10
2018-09-20 17:42:46 +02:00
committed by Thilo Graf
parent 1aece863c1
commit bc7be9dd74
8 changed files with 23 additions and 23 deletions

View File

@@ -1,12 +1,12 @@
#include "thread_abstraction.h"
SimpleThread::SimpleThread() :
Thread::Thread() :
mIsRunning(false),
mThread()
{
}
SimpleThread::~SimpleThread()
Thread::~Thread()
{
// if thread is still running on object destruction, cancel thread the hard way:
if (mIsRunning)
@@ -15,20 +15,20 @@ SimpleThread::~SimpleThread()
}
}
void SimpleThread::startThread()
void Thread::startThread()
{
mIsRunning = true;
pthread_create(&mThread, 0, &SimpleThread::runThread, this);
pthread_create(&mThread, 0, &Thread::runThread, this);
}
void SimpleThread::joinThread()
void Thread::joinThread()
{
pthread_join(mThread, 0);
mIsRunning = false;
}
void* SimpleThread::runThread(void* ptr)
void* Thread::runThread(void* ptr)
{
static_cast<SimpleThread*>(ptr)->run();
((Thread*)ptr)->run();
return 0;
}

View File

@@ -1,20 +1,20 @@
#ifndef _SIMPLETHREAD_ABSTRACTION_H
#define _SIMPLETHREAD_ABSTRACTION_H
#ifndef _THREAD_ABSTRACTION_H
#define _THREAD_ABSTRACTION_H
#include <pthread.h>
class SimpleThread
class Thread
{
bool mIsRunning;
pthread_t mThread;
static void* runThread(void*);
SimpleThread(const SimpleThread&);
const SimpleThread& operator=(const SimpleThread&);
Thread(const Thread&);
const Thread& operator=(const Thread&);
public:
SimpleThread();
~SimpleThread();
Thread();
~Thread();
void startThread();
void joinThread();