MAINT-1175: merge backout LLRegistrySingleton<std::type_info::name()>

1 files changed, 12 insertions, 20 deletions

diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h
index 99983a19cb..66c72c2d9f 100644
--- a/indra/llcommon/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@@ -212,14 +212,6 @@ namespace LLInitParam
 
 	public:
 		
-		struct CompareTypeID
-		{
-			bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
-			{
-				return lhs->before(*rhs);
-			}
-		};
-
 		typedef std::vector<std::pair<std::string, bool> >					name_stack_t;
 		typedef std::pair<name_stack_t::iterator, name_stack_t::iterator>	name_stack_range_t;
 		typedef std::vector<std::string>									possible_values_t;
@@ -242,20 +234,20 @@ namespace LLInitParam
 
 		template <typename T> bool readValue(T& param)
 	    {
-		    parser_read_func_map_t::iterator found_it = mParserReadFuncs->find(&typeid(T));
-		    if (found_it != mParserReadFuncs->end())
+		    boost::optional<parser_read_func_t> found_it = mParserReadFuncs->find<T>();
+		    if (found_it)
 		    {
-			    return found_it->second(*this, (void*)&param);
+			    return (*found_it)(*this, (void*)&param);
 		    }
 		    return false;
 	    }
 
 		template <typename T> bool writeValue(const T& param, name_stack_t& name_stack)
 		{
-		    parser_write_func_map_t::iterator found_it = mParserWriteFuncs->find(&typeid(T));
-		    if (found_it != mParserWriteFuncs->end())
+		    boost::optional<parser_write_func_t> found_it = mParserWriteFuncs->find<T>();
+		    if (found_it)
 		    {
-			    return found_it->second(*this, (const void*)&param, name_stack);
+			    return (*found_it)(*this, (const void*)&param, name_stack);
 		    }
 		    return false;
 		}
@@ -263,10 +255,10 @@ namespace LLInitParam
 		// dispatch inspection to registered inspection functions, for each parameter in a param block
 		template <typename T> bool inspectValue(name_stack_t& name_stack, S32 min_count, S32 max_count, const possible_values_t* possible_values)
 		{
-		    parser_inspect_func_map_t::iterator found_it = mParserInspectFuncs->find(&typeid(T));
-		    if (found_it != mParserInspectFuncs->end())
+		    boost::optional<parser_inspect_func_t> found_it = mParserInspectFuncs->find<T>();
+		    if (found_it)
 		    {
-			    found_it->second(name_stack, min_count, max_count, possible_values);
+			    (*found_it)(name_stack, min_count, max_count, possible_values);
 				return true;
 		    }
 			return false;
@@ -281,14 +273,14 @@ namespace LLInitParam
 		template <typename T>
 		void registerParserFuncs(parser_read_func_t read_func, parser_write_func_t write_func = NULL)
 		{
-			mParserReadFuncs->insert(std::make_pair(&typeid(T), read_func));
-			mParserWriteFuncs->insert(std::make_pair(&typeid(T), write_func));
+			mParserReadFuncs->insert<T>(read_func);
+			mParserWriteFuncs->insert<T>(write_func);
 		}
 
 		template <typename T>
 		void registerInspectFunc(parser_inspect_func_t inspect_func)
 		{
-			mParserInspectFuncs->insert(std::make_pair(&typeid(T), inspect_func));
+			mParserInspectFuncs->insert<T>(inspect_func);
 		}
 
 		bool				mParseSilently;