diff options
| author | Michael Lutz <michi@icosahedron.de> | 2019-03-17 01:59:46 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2019-04-06 11:27:39 +0200 |
| commit | 05bc2ed7cbe07cb4cd535932f10778b35f72e944 (patch) | |
| tree | 0faaf12fd1bafb0786236ffc82052e8b83dfca60 /src/genworld.h | |
| parent | 05f4e7360886e36b221ef5c3af4426625a3de686 (diff) | |
| download | openttd-05bc2ed7cbe07cb4cd535932f10778b35f72e944.tar.xz | |
Codechange: Replace custom thread code with C++11 thread objects.
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
Diffstat (limited to 'src/genworld.h')
| -rw-r--r-- | src/genworld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/genworld.h b/src/genworld.h index 1b1c806e0..ce6b39bd9 100644 --- a/src/genworld.h +++ b/src/genworld.h @@ -13,6 +13,7 @@ #define GENWORLD_H #include "company_type.h" +#include <thread> /** Constants related to world generation */ enum LandscapeGenerator { @@ -61,7 +62,7 @@ struct GenWorldInfo { uint size_y; ///< Y-size of the map GWDoneProc *proc; ///< Proc that is called when done (can be NULL) GWAbortProc *abortp; ///< Proc that is called when aborting (can be NULL) - class ThreadObject *thread; ///< The thread we are in (can be NULL) + std::thread thread; ///< The thread we are in (joinable if a thread was created) }; /** Current stage of world generation process */ |