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

Merge branch 'master' into enet_wip_nothing_to_see_here

This commit is contained in:
Lynix 2017-02-02 10:11:49 +01:00
parent 41d06fed38 2518a3939f
commit b0e7c4ba06
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile
View File

@ -38,7 +38,7 @@ PROJECT_NAME = "Nazara Engine"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # 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 # 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 # for a project that appears at the top of each page and should give viewer a

5
include/Nazara/Core/MemoryHelper.hpp
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" // This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
@ -38,6 +38,9 @@ namespace Nz
template<typename T, typename... Args> template<typename T, typename... Args>
T* PlacementNew(T* ptr, Args&&... args); T* PlacementNew(T* ptr, Args&&... args);
template<typename T>
void PlacementDestroy(T* ptr);
class StackAllocation class StackAllocation
{ {
public: public:

13
include/Nazara/Core/MemoryHelper.inl
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" // This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp // 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)...); 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 * \ingroup core
* \class Nz::StackAllocation * \class Nz::StackAllocation

4
include/Nazara/Prerequesites.hpp
View File

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