summaryrefslogtreecommitdiff
path: root/src/script/cpp_api
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-08-16 22:11:45 +0200
committerGitHub <noreply@github.com>2017-08-16 22:11:45 +0200
commit85511a642f851100d0d856f4ecbe7fea7a7bb049 (patch)
treeb25e4196578cb4734008642a29101393c6d9c457 /src/script/cpp_api
parent816bca32ac69f58b7de881d68689c6a1e3897a0e (diff)
downloadminetest-85511a642f851100d0d856f4ecbe7fea7a7bb049.tar.gz
minetest-85511a642f851100d0d856f4ecbe7fea7a7bb049.tar.bz2
minetest-85511a642f851100d0d856f4ecbe7fea7a7bb049.zip
Cleanup various headers to reduce compilation times (#6255)
* Cleanup various headers to reduce compilation times
Diffstat (limited to 'src/script/cpp_api')
-rw-r--r--src/script/cpp_api/s_async.h4
-rw-r--r--src/script/cpp_api/s_base.h2
-rw-r--r--src/script/cpp_api/s_internal.h1
3 files changed, 4 insertions, 3 deletions
diff --git a/src/script/cpp_api/s_async.h b/src/script/cpp_api/s_async.h
index 94b55db6e..aa1559ed1 100644
--- a/src/script/cpp_api/s_async.h
+++ b/src/script/cpp_api/s_async.h
@@ -24,8 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <deque>
#include <map>
-#include "threading/thread.h"
#include "threading/semaphore.h"
+#include "threading/thread.h"
#include "debug.h"
#include "lua.h"
#include "cpp_api/s_base.h"
@@ -39,7 +39,7 @@ class AsyncEngine;
// Data required to queue a job
struct LuaJobInfo
{
- LuaJobInfo() {};
+ LuaJobInfo() = default;
// Function to be called in async environment
std::string serializedFunction = "";
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index 28fefdd37..ff92bdf93 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <iostream>
#include <string>
#include <thread>
+#include <mutex>
#include "util/basic_macros.h"
extern "C" {
@@ -30,7 +31,6 @@ extern "C" {
}
#include "irrlichttypes.h"
-#include "threading/mutex_auto_lock.h"
#include "common/c_types.h"
#include "common/c_internal.h"
diff --git a/src/script/cpp_api/s_internal.h b/src/script/cpp_api/s_internal.h
index 315561e08..b493cb6fa 100644
--- a/src/script/cpp_api/s_internal.h
+++ b/src/script/cpp_api/s_internal.h
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <thread>
#include "common/c_internal.h"
#include "cpp_api/s_base.h"
+#include "threading/mutex_auto_lock.h"
#ifdef SCRIPTAPI_LOCK_DEBUG
#include "debug.h" // assert()