summaryrefslogtreecommitdiff
path: root/indra/llui/llxuiparser.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-07-18 15:51:34 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-07-18 15:51:34 -0400
commit7f609b6a6958f519bb1becb604132b583ada3fad (patch)
tree0ec9f6eaeacd0f87181a8097c2537ba36696e57f /indra/llui/llxuiparser.h
parent18bd525d00ee3ce16164900293ee6ea8c2204589 (diff)
Backed out changeset a25bfa87418d (using std::type_info::name())
The changeset above touched every consumer of the two LLRegistrySingletons originally defined with std::type_info* as keys. Those two LLRegistrySingletons were changed to use const char* as keys, then all consumers were changed to pass std::type_info::name() instead of the plain std::type_info* pointer -- to deal with the observed fact that on Linux, a given type might produce different std::type_info* pointers in different load modules. Since then, Richard turned up the fascinating fact that at least some implementations of gcc's std::type_info::before() method already accommodate this peculiarity. It seems worth backing out the (dismayingly pervasive) change to see if properly using std::type_info::before() as the map comparator will work just as well, with conceptually simpler source code. This backout is transitional: we don't expect things to build/run properly until we've cherry-picked certain other pertinent changes.
Diffstat (limited to 'indra/llui/llxuiparser.h')
-rw-r--r--indra/llui/llxuiparser.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llxuiparser.h b/indra/llui/llxuiparser.h
index 3c092afdd6..d7cd256967 100644
--- a/indra/llui/llxuiparser.h
+++ b/indra/llui/llxuiparser.h
@@ -55,9 +55,8 @@ typedef boost::function<LLView* (LLXMLNodePtr node, LLView *parent, LLXMLNodePtr
typedef LLRegistry<std::string, LLWidgetCreatorFunc> widget_registry_t;
-// const char* key used for std::type_info::name() string
class LLChildRegistryRegistry
-: public LLRegistrySingleton<const char*, widget_registry_t, LLChildRegistryRegistry>
+: public LLRegistrySingleton<const std::type_info*, widget_registry_t, LLChildRegistryRegistry>
{};