Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

This commit is contained in:
Jérôme Leclercq 2017-02-08 13:13:52 +01:00
commit 784cfab23b
5 changed files with 20 additions and 6 deletions

View File

@ -38,7 +38,7 @@ PROJECT_NAME = "Nazara Engine"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 0.2
PROJECT_NUMBER = 0.3
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

View File

@ -1,4 +1,4 @@
// Copyright (C) 2017 Jérôme Leclercq
// Copyright (C) 2017 Jérôme Leclercq
// This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp
@ -38,6 +38,9 @@ namespace Nz
template<typename T, typename... Args>
T* PlacementNew(T* ptr, Args&&... args);
template<typename T>
void PlacementDestroy(T* ptr);
class StackAllocation
{
public:

View File

@ -1,4 +1,4 @@
// Copyright (C) 2017 Jérôme Leclercq
// Copyright (C) 2017 Jérôme Leclercq
// This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp
@ -64,6 +64,17 @@ namespace Nz
return new (ptr) T(std::forward<Args>(args)...);
}
/*!
* \brief Calls the object destructor explicitly
*
* \param ptr Pointer to a previously constructed pointer on raw memory
*/
template<typename T>
void PlacementDestroy(T* ptr)
{
ptr->~T();
}
/*!
* \ingroup core
* \class Nz::StackAllocation

View File

@ -40,7 +40,7 @@ namespace Nz
static std::array<Vector4f, 2 * 2 * 2 * 2 * 2> s_gradients4;
private:
std::default_random_engine m_randomEngine;
std::mt19937 m_randomEngine;
};
}

View File

@ -77,8 +77,8 @@
// Nazara version macro
#define NAZARA_VERSION_MAJOR 0
#define NAZARA_VERSION_MINOR 2
#define NAZARA_VERSION_PATCH 1
#define NAZARA_VERSION_MINOR 3
#define NAZARA_VERSION_PATCH 0
#include <Nazara/Core/Config.hpp>