Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add IntrusivePtr<>::Reset 

minor
This commit is contained in:
Nomango 2019-02-08 08:38:18 +08:00 committed by Nomango
parent 55f28806c9
commit 2c149ff8b1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/IntrusivePtr.hpp
View File

@ -67,6 +67,11 @@ namespace easy2d
inline Type* Get() const E2D_NOEXCEPT { return ptr_; } inline Type* Get() const E2D_NOEXCEPT { return ptr_; }
inline void Reset() E2D_NOEXCEPT
{
IntrusivePtr{}.Swap(*this);
}
inline void Swap(IntrusivePtr& other) E2D_NOEXCEPT inline void Swap(IntrusivePtr& other) E2D_NOEXCEPT
{ {
std::swap(ptr_, other.ptr_); std::swap(ptr_, other.ptr_);

6
src/math/scalar.hpp
View File

@ -22,12 +22,6 @@
#include "constants.hpp" #include "constants.hpp"
#include <cmath> #include <cmath>
#if _MSC_VER >= 1900
# define E2D_CONSTEXPR constexpr
#else
# define E2D_CONSTEXPR const
#endif
namespace easy2d namespace easy2d
{ {