aboutsummaryrefslogtreecommitdiff
path: root/src/script/cpp_api/s_async.h
diff options
context:
space:
mode:
authorVincent Glize <vincentglize@hotmail.fr>2017-06-19 23:54:58 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-06-19 23:54:58 +0200
commit4a5e8ad343079f6552fab639770e5771ed7c4e7a (patch)
treeeeab3adec1fc3e7a3b06d9f53b92ab99a5e0d290 /src/script/cpp_api/s_async.h
parent4a789490834157baa8788a2f36c95b86c1e4440e (diff)
downloadminetest-4a5e8ad343079f6552fab639770e5771ed7c4e7a.tar.xz
C++11 cleanup on constructors (#6000)
* C++11 cleanup on constructors dir script
Diffstat (limited to 'src/script/cpp_api/s_async.h')
-rw-r--r--src/script/cpp_api/s_async.h26
1 files changed, 10 insertions, 16 deletions
diff --git a/src/script/cpp_api/s_async.h b/src/script/cpp_api/s_async.h
index 45f935d0a..94b55db6e 100644
--- a/src/script/cpp_api/s_async.h
+++ b/src/script/cpp_api/s_async.h
@@ -39,24 +39,18 @@ class AsyncEngine;
// Data required to queue a job
struct LuaJobInfo
{
- LuaJobInfo() :
- serializedFunction(""),
- serializedParams(""),
- serializedResult(""),
- id(0),
- valid(false)
- {}
+ LuaJobInfo() {};
// Function to be called in async environment
- std::string serializedFunction;
+ std::string serializedFunction = "";
// Parameter to be passed to function
- std::string serializedParams;
+ std::string serializedParams = "";
// Result of function call
- std::string serializedResult;
+ std::string serializedResult = "";
// JobID used to identify a job and match it to callback
- unsigned int id;
+ unsigned int id = 0;
- bool valid;
+ bool valid = false;
};
// Asynchronous working environment
@@ -68,7 +62,7 @@ public:
void *run();
private:
- AsyncEngine *jobDispatcher;
+ AsyncEngine *jobDispatcher = nullptr;
};
// Asynchornous thread and job management
@@ -76,7 +70,7 @@ class AsyncEngine {
friend class AsyncWorkerThread;
typedef void (*StateInitializer)(lua_State *L, int top);
public:
- AsyncEngine();
+ AsyncEngine() {};
~AsyncEngine();
/**
@@ -137,13 +131,13 @@ protected:
private:
// Variable locking the engine against further modification
- bool initDone;
+ bool initDone = false;
// Internal store for registred state initializers
std::vector<StateInitializer> stateInitializers;
// Internal counter to create job IDs
- unsigned int jobIdCounter;
+ unsigned int jobIdCounter = 0;
// Mutex to protect job queue
std::mutex jobQueueMutex;