diff options
author | Mattes D <github@xoft.cz> | 2014-12-04 22:07:04 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-12-04 22:07:04 +0100 |
commit | 64f8428d037e56986bb18e064a4b49de96c480ff (patch) | |
tree | fd06612b4db4179f37e4216f7b1911e35de43acd | |
parent | Merged branch 'origin/master' into c++11. (diff) | |
download | cuberite-64f8428d037e56986bb18e064a4b49de96c480ff.tar cuberite-64f8428d037e56986bb18e064a4b49de96c480ff.tar.gz cuberite-64f8428d037e56986bb18e064a4b49de96c480ff.tar.bz2 cuberite-64f8428d037e56986bb18e064a4b49de96c480ff.tar.lz cuberite-64f8428d037e56986bb18e064a4b49de96c480ff.tar.xz cuberite-64f8428d037e56986bb18e064a4b49de96c480ff.tar.zst cuberite-64f8428d037e56986bb18e064a4b49de96c480ff.zip |
-rw-r--r-- | src/OSSupport/IsThread.cpp | 10 | ||||
-rw-r--r-- | src/Root.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp index 8914cac90..9c62c89bf 100644 --- a/src/OSSupport/IsThread.cpp +++ b/src/OSSupport/IsThread.cpp @@ -18,10 +18,10 @@ #pragma pack(push, 8) struct THREADNAME_INFO { - DWORD dwType; // Must be 0x1000. - LPCSTR szName; // Pointer to name (in user addr space). - DWORD dwThreadID; // Thread ID (-1 = caller thread). - DWORD dwFlags; // Reserved for future use, must be zero. + DWORD dwType; // Must be 0x1000. + LPCSTR szName; // Pointer to name (in user addr space). + DWORD dwThreadID; // Thread ID (-1 = caller thread). + DWORD dwFlags; // Reserved for future use, must be zero. }; #pragma pack(pop) @@ -39,7 +39,7 @@ { } } -#endif // _MSC_VER && _DEBUG +#endif // _MSC_VER && _DEBUG diff --git a/src/Root.cpp b/src/Root.cpp index c69710628..865b2a213 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -116,7 +116,7 @@ void cRoot::Start(void) m_bStop = false; while (!m_bStop) { - auto BeginTime = std::chrono::steady_clock::now(); + auto BeginTime = std::chrono::steady_clock::now(); m_bRestart = false; LoadGlobalSettings(); |