diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-06 14:34:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 14:34:14 +0200 |
| commit | b3dfe5332cd345c7f33b8a3828649122145f7a12 (patch) | |
| tree | 8cbde893ad87e4663946f35cc9d19f2b52fcf16b /src/environment.h | |
| parent | a6678d6e5a46c847c298bdca01e4499b8d601337 (diff) | |
| download | minetest-b3dfe5332cd345c7f33b8a3828649122145f7a12.tar.gz minetest-b3dfe5332cd345c7f33b8a3828649122145f7a12.tar.bz2 minetest-b3dfe5332cd345c7f33b8a3828649122145f7a12.zip | |
C++11 patchset 3: remove Atomic/GenericAtomic and use std::atomic (#5906)
Diffstat (limited to 'src/environment.h')
| -rw-r--r-- | src/environment.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/environment.h b/src/environment.h index 5a40ff31a..ff3942599 100644 --- a/src/environment.h +++ b/src/environment.h @@ -33,11 +33,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <list> #include <queue> #include <map> +#include <atomic> #include "irr_v3d.h" #include "activeobject.h" #include "util/numeric.h" #include "threading/mutex.h" -#include "threading/atomic.h" #include "network/networkprotocol.h" // for AccessDeniedCode class IGameDef; @@ -81,7 +81,7 @@ public: IGameDef *getGameDef() { return m_gamedef; } protected: - GenericAtomic<float> m_time_of_day_speed; + std::atomic<float> m_time_of_day_speed; /* * Below: values managed by m_time_lock @@ -98,7 +98,7 @@ protected: u32 m_day_night_ratio_override; // Days from the server start, accounts for time shift // in game (e.g. /time or bed usage) - Atomic<u32> m_day_count; + std::atomic<u32> m_day_count; /* * Above: values managed by m_time_lock */ |