livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete LLSINGLETON_C11 and LLSINGLETON_EMPTY_CTOR_C11 macros

master
Ansariel 2024-03-13 09:40:20 +01:00 committed by Andrey Lihatskiy
parent 6b285674bb
commit 0cc3a4bf68
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/llcommon/llsingleton.h
View File

@ -806,17 +806,6 @@ private: \
friend class LLSingleton<DERIVED_CLASS>; \
DERIVED_CLASS(__VA_ARGS__)
/**
* A slight variance from the above, but includes the "override" keyword
*/
#define LLSINGLETON_C11(DERIVED_CLASS) \
private: \
/* implement LLSingleton pure virtual method whose sole purpose */ \
/* is to remind people to use this macro */ \
virtual void you_must_use_LLSINGLETON_macro() override {} \
friend class LLSingleton<DERIVED_CLASS>; \
DERIVED_CLASS()
/**
* Use LLSINGLETON_EMPTY_CTOR(Foo); at the start of an LLSingleton<Foo>
* subclass body when the constructor is trivial:
@ -835,10 +824,6 @@ private: \
/* LLSINGLETON() is carefully implemented to permit exactly this */ \
LLSINGLETON(DERIVED_CLASS) {}
#define LLSINGLETON_EMPTY_CTOR_C11(DERIVED_CLASS) \
/* LLSINGLETON() is carefully implemented to permit exactly this */ \
LLSINGLETON_C11(DERIVED_CLASS) {}
// Relatively unsafe singleton implementation that is much faster
// and simpler than LLSingleton, but has no dependency tracking
// or inherent thread safety and requires manual invocation of

2
indra/newview/llchicletbar.h
View File

@ -38,7 +38,7 @@ class LLChicletBar
: public LLSingleton<LLChicletBar>
, public LLPanel
{
LLSINGLETON_C11(LLChicletBar);
LLSINGLETON(LLChicletBar);
LOG_CLASS(LLChicletBar);
public:

2
indra/newview/llpaneltopinfobar.h
View File

@ -37,7 +37,7 @@ class LLParcelChangeObserver;
class LLPanelTopInfoBar : public LLPanel, public LLSingleton<LLPanelTopInfoBar>, private LLDestroyClass<LLPanelTopInfoBar>
{
LLSINGLETON_C11(LLPanelTopInfoBar);
LLSINGLETON(LLPanelTopInfoBar);
~LLPanelTopInfoBar();
LOG_CLASS(LLPanelTopInfoBar);

2
indra/newview/llvoiceclient.h
View File

@ -492,7 +492,7 @@ protected:
**/
class LLSpeakerVolumeStorage : public LLSingleton<LLSpeakerVolumeStorage>
{
LLSINGLETON_C11(LLSpeakerVolumeStorage);
LLSINGLETON(LLSpeakerVolumeStorage);
~LLSpeakerVolumeStorage();
LOG_CLASS(LLSpeakerVolumeStorage);