From 6a82ff08d9d47f70e3a5a8021f964dd91a55a7da Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 28 May 2015 16:52:09 -0400 Subject: MAINT-5232: Normalize LLGlobalEconomy's use of LLSingleton. LLSingleton currently presents two different usage styles: deriving MyClass from LLSingleton, or just using a typedef. Turns out LLGlobalEconomy is the ONLY class using the typedef style -- and the apologetic comment talks about a potential maintenance that hasn't actually happened. Derive LLGlobalEconomy from LLSingleton, like everyone else. --- indra/llinventory/lleconomy.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'indra/llinventory') diff --git a/indra/llinventory/lleconomy.h b/indra/llinventory/lleconomy.h index 47fcf688a2..9c27ac5fb3 100755 --- a/indra/llinventory/lleconomy.h +++ b/indra/llinventory/lleconomy.h @@ -42,17 +42,12 @@ public: virtual void onEconomyDataChange() = 0; }; -class LLGlobalEconomy +class LLGlobalEconomy: public LLSingleton { public: LLGlobalEconomy(); virtual ~LLGlobalEconomy(); - // This class defines its singleton internally as a typedef instead of inheriting from - // LLSingleton like most others because the LLRegionEconomy sub-class might also - // become a singleton and this pattern will more easily disambiguate them. - typedef LLSingleton Singleton; - void initSingleton() { } virtual void print(); -- cgit v1.2.3