diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-07-11 08:14:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-07-11 08:14:34 -0400 |
| commit | 18bd525d00ee3ce16164900293ee6ea8c2204589 (patch) | |
| tree | 2df909295d47867ec3dba9737ee3631e31cdf04d /indra/llui/lluictrlfactory.h | |
| parent | 70035274093e8803f8c7f28162feef311ef725b4 (diff) | |
MAINT-1175: Forbid LLRegistry[Singleton]<std::type_info*, ...>.
Back out code that selects LLTypeInfoLookup for the underlying map
implementation when KEY = [const] std::type_info*, because LLTypeInfoLookup's
API is changing to become incompatible with std::map. Instead, fail with
STATIC_ASSERT when LLRegistry's KEY is [const] std::type_info*.
Fix all existing uses to use std::type_info::name() string instead.
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
| -rw-r--r-- | indra/llui/lluictrlfactory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index d612ad5005..1f7a8e08ce 100644 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -69,9 +69,9 @@ protected: friend class LLSingleton<LLDefaultChildRegistry>; }; -// lookup widget name by type +// lookup widget name by type (actually by std::type_info::name()) class LLWidgetNameRegistry -: public LLRegistrySingleton<const std::type_info*, std::string, LLWidgetNameRegistry , LLCompareTypeID> +: public LLRegistrySingleton<const char*, std::string, LLWidgetNameRegistry , LLCompareTypeID> {}; // lookup function for generating empty param block by widget type |