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/llrngwriter.cpp | |
| 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/llrngwriter.cpp')
| -rw-r--r-- | indra/llui/llrngwriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp index 5e6840d7df..90a1e77b1a 100644 --- a/indra/llui/llrngwriter.cpp +++ b/indra/llui/llrngwriter.cpp @@ -92,7 +92,7 @@ void LLRNGWriter::addDefinition(const std::string& type_name, const LLInitParam: // add includes for all possible children const std::type_info* type = *LLWidgetTypeRegistry::instance().getValue(type_name); - const widget_registry_t* widget_registryp = LLChildRegistryRegistry::instance().getValue(type); + const widget_registry_t* widget_registryp = LLChildRegistryRegistry::instance().getValue(type->name()); // add include declarations for all valid children for (widget_registry_t::Registrar::registry_map_t::const_iterator it = widget_registryp->currentRegistrar().beginItems(); |