From 709c1eeae90dae106800e3742f3655bd7b590b7b Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 11 Jul 2012 14:13:45 -0400
Subject: MAINT-1175: Properly pass LLRegistry's COMPARATOR to underlying map.
 Although LLRegistry and LLRegistrySingleton have always defined a COMPARATOR
 template parameter, it wasn't used for the underlying map. Therefore every
 type, including any pointer type, was being compared using std::less. This
 happens to work most of the time -- but is tripping us up now. Pass
 COMPARATOR to underlying std::map. Fix a couple minor bugs in
 LLRegistryDefaultComparator (never before used!). Specialize for const char*.
 Remove CompareTypeID and LLCompareTypeID because we now actively forbid using
 LLRegistry<std::type_info*, ...>; remove only known reference
 (LLWidgetNameRegistry definition).

---
 indra/llui/lluictrlfactory.h | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 1f7a8e08ce..a5fd83e555 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -34,15 +34,6 @@
 
 class LLView;
 
-// sort functor for typeid maps
-struct LLCompareTypeID
-{
-	bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
-	{
-		return lhs->before(*rhs);
-	}
-};
-
 // lookup widget constructor funcs by widget name
 template <typename DERIVED_TYPE>
 class LLChildRegistry : public LLRegistrySingleton<std::string, LLWidgetCreatorFunc, DERIVED_TYPE>
@@ -71,7 +62,7 @@ protected:
 
 // lookup widget name by type (actually by std::type_info::name())
 class LLWidgetNameRegistry 
-:	public LLRegistrySingleton<const char*, std::string, LLWidgetNameRegistry , LLCompareTypeID>
+:	public LLRegistrySingleton<const char*, std::string, LLWidgetNameRegistry>
 {};
 
 // lookup function for generating empty param block by widget type
-- 
cgit v1.2.3