diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-04-03 15:53:53 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-04-03 15:53:53 -0400 |
| commit | 13f8d512ec58bbbd076217333711d82c7520ac5c (patch) | |
| tree | c0838387c7e0043c18dfa4ab4ec67cc50a960914 /indra/llcommon | |
| parent | 64581fb8d001262d2e34b3e3b653e485555d9c9c (diff) | |
| parent | e2b56c9bbafdf9908361f43d68b4ce0c56e90d85 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
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; }; |