mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

libobs: Use nullptr instead of NULL

Browse Source
This commit is contained in:
jp9000 2015-03-20 22:07:40 -07:00 committed by Skyler Lipthay
parent 644ac130f8
commit 001bfb4a6d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libobs/util/windows/ComPtr.hpp
View File

@ -40,17 +40,17 @@ protected:
} }
public: public:
inline ComPtr() : ptr(NULL) {} inline ComPtr() : ptr(nullptr) {}
inline ComPtr(T *p) : ptr(p) {if (ptr) ptr->AddRef();} inline ComPtr(T *p) : ptr(p) {if (ptr) ptr->AddRef();}
inline ComPtr(const ComPtr<T> &c) : ptr(c.ptr) {if (ptr) ptr->AddRef();} inline ComPtr(const ComPtr<T> &c) : ptr(c.ptr) {if (ptr) ptr->AddRef();}
inline ComPtr(ComPtr<T> &&c) : ptr(c.ptr) {c.ptr = NULL;} inline ComPtr(ComPtr<T> &&c) : ptr(c.ptr) {c.ptr = nullptr;}
inline ~ComPtr() {Kill();} inline ~ComPtr() {Kill();}
inline void Clear() inline void Clear()
{ {
if (ptr) { if (ptr) {
ptr->Release(); ptr->Release();
ptr = NULL; ptr = nullptr;
} }
} }
@ -71,7 +71,7 @@ public:
if (this != &c) { if (this != &c) {
Kill(); Kill();
ptr = c.ptr; ptr = c.ptr;
c.ptr = NULL; c.ptr = nullptr;
} }
return *this; return *this;