diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-30 15:40:22 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-30 15:40:22 -0400 |
| commit | b9a2a8b22395253af1508c09eca3c55aa54ee58e (patch) | |
| tree | 2344dfc3ce4d2fb2df3134a3f09c481b1a31bc28 /indra/llcommon | |
| parent | 71ffed27c77e787cafe04ddf19df27495255cae5 (diff) | |
| parent | e9fe0714ad422c2b9250c8ce13d3b2837dff5430 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-xcode-8.3
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsafehandle.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llcommon/llsafehandle.h b/indra/llcommon/llsafehandle.h index 4226bf04f0..af1c26dd4f 100644 --- a/indra/llcommon/llsafehandle.h +++ b/indra/llcommon/llsafehandle.h @@ -112,10 +112,6 @@ public: return *this; } -public: - typedef Type* (*NullFunc)(); - static const NullFunc sNullFunc; - protected: void ref() { @@ -155,6 +151,12 @@ protected: return ptr == NULL ? sNullFunc() : ptr; } + static Type* sNullFunc() + { + static Type sInstance; + return &sInstance; + } + protected: Type* mPointer; }; |