1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00

Fix some errors and warnings when compiling with Clang

This commit is contained in:
2014-08-09 12:16:25 -07:00
parent a1303d6d23
commit 9d67b96837
3 changed files with 5 additions and 3 deletions

View File

@ -43,6 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define hsRefCnt_Defiend
#include <atomic>
#include <cstddef>
class hsRefCnt {
private:
@ -83,7 +84,7 @@ class hsRef
{
public:
hsRef() : fObj(nullptr) { }
hsRef(nullptr_t) : fObj(nullptr) { }
hsRef(std::nullptr_t) : fObj(nullptr) { }
hsRef(_Ref *obj) : fObj(obj) { if (fObj) fObj->Ref(); }
hsRef(const hsRef<_Ref> &copy) : fObj(copy.fObj) { if (fObj) fObj->Ref(); }
hsRef(hsRef<_Ref> &&move) : fObj(move.fObj) { move.fObj = nullptr; }
@ -110,7 +111,7 @@ public:
return *this;
}
hsRef<_Ref> &operator=(nullptr_t)
hsRef<_Ref> &operator=(std::nullptr_t)
{
if (fObj)
fObj->UnRef();