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

Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

Browse Source
This commit is contained in:
Jérôme Leclercq
2017-06-21 18:10:51 +02:00
parent b2e23cfb56 bb512ff17a
commit 2ca844be63
17 changed files with 247 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/Config.hpp
View File

@@ -73,7 +73,7 @@
#define NAZARA_CORE_WINDOWS_CS_SPINLOCKS 4096
// Optimize the Windows implementation with technologies of Windows NT 6.0 (and greater) (Break the compatibility with Windows XP)
#define NAZARA_CORE_WINDOWS_NT6 0
#define NAZARA_CORE_WINDOWS_NT6 1
/*

6
include/Nazara/Core/Flags.hpp
View File

@@ -56,7 +56,7 @@ namespace Nz
};
// Little hack to have them in both Nz and global scope
namespace DetailFlagOperators
namespace FlagsOperators
{
template<typename E> constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator~(E lhs);
template<typename E> constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator|(E lhs, E rhs);
@@ -64,10 +64,10 @@ namespace Nz
template<typename E> constexpr std::enable_if_t<EnumAsFlags<E>::value, Flags<E>> operator^(E lhs, E rhs);
}
using namespace DetailFlagOperators;
using namespace FlagsOperators;
}
using namespace Nz::DetailFlagOperators;
using namespace Nz::FlagsOperators;
#include <Nazara/Core/Flags.inl>

2
include/Nazara/Core/Flags.inl
View File

@@ -211,7 +211,7 @@ namespace Nz
}
namespace DetailFlagOperators
namespace FlagsOperators
{
/*!
* \brief Override binary NOT operator on enum to turns into a Flags object.

2
include/Nazara/Core/Thread.hpp
View File

@@ -32,11 +32,13 @@ namespace Nz
Id GetId() const;
bool IsJoinable() const;
void Join();
void SetName(const String& name);
Thread& operator=(const Thread&) = delete;
Thread& operator=(Thread&& thread);
static unsigned int HardwareConcurrency();
static void SetCurrentThreadName(const String& name);
static void Sleep(UInt32 milliseconds);
private:

2
include/Nazara/Lua/LuaInstance.inl
View File

@@ -24,7 +24,7 @@ namespace Nz
inline void LuaInstance::SetMemoryLimit(std::size_t memoryLimit)
{
m_memoryLimit = m_memoryLimit;
m_memoryLimit = memoryLimit;
}
inline void LuaInstance::SetTimeLimit(UInt32 limit)