diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
| commit | 5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (patch) | |
| tree | aff6d5b13b69121919433f80103e0594b3525c9d /indra/llcommon/llsafehandle.h | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
| parent | 7a6a2db289581e43c509ca7dfff7d9b72897a10e (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llsafehandle.h')
| -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; }; |