diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-11 10:23:16 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-19 14:56:30 -0500 |
| commit | f997bcd186d00e30132f32be007bb3978bf3a8f5 (patch) | |
| tree | a3dde2e0e252be6d7439aca7f3c36babe673d2e9 /indra/llcommon | |
| parent | 106d52c6ee9b10dd7a7baca3b09a01073c61949d (diff) | |
SL-16094: Stylish braces!
(cherry picked from commit 18de6c9b989cc7060f2a314f5b68cc102677823b)
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsingleton.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h index 24d01812c9..da2d6fd984 100644 --- a/indra/llcommon/llsingleton.h +++ b/indra/llcommon/llsingleton.h @@ -859,9 +859,16 @@ public: static inline T& instance() { return *getInstance(); } static inline bool instanceExists() { return sInstance != nullptr; } +<<<<<<< HEAD static void deleteSingleton() { delete sInstance; sInstance = nullptr; +======= + static void deleteSingleton() + { + delete sInstance; + sInstance = nullptr; +>>>>>>> 18de6c9b98 (SL-16094: Stylish braces!) } }; |