sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into NDK

Browse Source 
Conflicts:
	include/Nazara/Core/ConditionVariable.hpp

Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213
This commit is contained in:
Lynix
2015-08-21 12:49:05 +02:00
parent dce9831c19 8bdb1c5206
commit dea48a289d
18 changed files with 316 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Core/ConditionVariable.hpp
View File

@@ -8,11 +8,12 @@
#define NAZARA_CONDITIONVARIABLE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
class NzConditionVariableImpl;
class NzMutex;
class NAZARA_CORE_API NzConditionVariable
class NAZARA_CORE_API NzConditionVariable : NzNonCopyable
{
public:
NzConditionVariable();