diff options
| -rw-r--r-- | indra/llcommon/llsingleton.h | 15 | ||||
| -rw-r--r-- | indra/newview/llchicletbar.h | 2 | ||||
| -rw-r--r-- | indra/newview/llpaneltopinfobar.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.h | 2 |
4 files changed, 3 insertions, 18 deletions
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h index cbe5ab6406..5ca6b65259 100644 --- a/indra/llcommon/llsingleton.h +++ b/indra/llcommon/llsingleton.h @@ -807,17 +807,6 @@ private: \ 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 diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h index 1e6671de94..fb8c6d400a 100644 --- a/indra/newview/llchicletbar.h +++ b/indra/newview/llchicletbar.h @@ -38,7 +38,7 @@ class LLChicletBar : public LLSingleton<LLChicletBar> , public LLPanel { - LLSINGLETON_C11(LLChicletBar); + LLSINGLETON(LLChicletBar); LOG_CLASS(LLChicletBar); public: diff --git a/indra/newview/llpaneltopinfobar.h b/indra/newview/llpaneltopinfobar.h index 2cd678f323..eefe702667 100644 --- a/indra/newview/llpaneltopinfobar.h +++ b/indra/newview/llpaneltopinfobar.h @@ -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); diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index 010d0e8004..b3f5edfa4c 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -492,7 +492,7 @@ protected: **/ class LLSpeakerVolumeStorage : public LLSingleton<LLSpeakerVolumeStorage> { - LLSINGLETON_C11(LLSpeakerVolumeStorage); + LLSINGLETON(LLSpeakerVolumeStorage); ~LLSpeakerVolumeStorage(); LOG_CLASS(LLSpeakerVolumeStorage); |