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

Fix some errors and warnings when compiling with Clang

Browse Source
This commit is contained in:
Michael Hansen
2014-08-09 12:16:25 -07:00
parent a1303d6d23
commit 9d67b96837
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/Plasma/CoreLib/hsRefCnt.h
View File

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

1
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.h
View File

@ -226,6 +226,7 @@ class pfGUIDropTargetProc
public: public:
pfGUIDropTargetProc() { fRefCnt = 0; } pfGUIDropTargetProc() { fRefCnt = 0; }
virtual ~pfGUIDropTargetProc() { }
virtual bool CanEat( pfGUIListElement *element, pfGUIControlMod *source ) = 0; virtual bool CanEat( pfGUIListElement *element, pfGUIControlMod *source ) = 0;
virtual void Eat( pfGUIListElement *element, pfGUIControlMod *source, pfGUIControlMod *parent ) = 0; virtual void Eat( pfGUIListElement *element, pfGUIControlMod *source, pfGUIControlMod *parent ) = 0;

2
Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp
View File

@ -154,7 +154,7 @@ void CryptKeyClose (
if (!key) if (!key)
return; return;
delete key->handle; delete (RC4_KEY *)key->handle;
delete key; delete key;
} }