From 2e83dfa217feb90e7b94e499346ad9b98fa711b2 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 18 Jul 2012 20:33:54 -0400
Subject: MAINT-1175: Ditch LLTypeInfoLookup, make map<const type_info*> work.
 Instead of forbidding std::map<const std::type_info*, ...> outright (which
 includes LLRegistry<const std::type_info*, ...> and LLRegistrySingleton<const
 std::type_info*, ...>), try to make it work by specializing std::less<const
 std::type_info*> to use std::type_info::before(). Make
 LLRegistryDefaultComparator<T> use std::less<T> so it can capitalize on that
 specialization.

---
 indra/llcommon/llstl.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'indra/llcommon/llstl.h')

diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
index 8ad12c9a03..6109b21546 100644
--- a/indra/llcommon/llstl.h
+++ b/indra/llcommon/llstl.h
@@ -33,6 +33,7 @@
 #include <vector>
 #include <set>
 #include <deque>
+#include <typeinfo>
 
 // Use to compare the first element only of a pair
 // e.g. typedef std::set<std::pair<int, Data*>, compare_pair<int, Data*> > some_pair_set_t; 
@@ -470,4 +471,33 @@ llbind2nd(const _Operation& __oper, const _Tp& __x)
   return llbinder2nd<_Operation>(__oper, _Arg2_type(__x));
 }
 
+/**
+ * Specialize std::less<std::type_info*> to use std::type_info::before().
+ * See MAINT-1175. It is NEVER a good idea to directly compare std::type_info*
+ * because, on Linux, you might get different std::type_info* pointers for the
+ * same type (from different load modules)!
+ */
+namespace std
+{
+    template <>
+    struct less<const std::type_info*>:
+        public std::binary_function<const std::type_info*, const std::type_info*, bool>
+    {
+        bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
+        {
+            return lhs->before(*rhs);
+        }
+    };
+
+    template <>
+    struct less<std::type_info*>:
+        public std::binary_function<std::type_info*, std::type_info*, bool>
+    {
+        bool operator()(std::type_info* lhs, std::type_info* rhs) const
+        {
+            return lhs->before(*rhs);
+        }
+    };
+} // std
+
 #endif // LL_LLSTL_H
-- 
cgit v1.2.3


From 27cbfef0269146eb296bbd2b810a6d331e5cb7d2 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 19 Jul 2012 08:35:11 -0400
Subject: MAINT-1175: Use workaround for comparing std::type_info* on gcc <
 4.4. We now specialize std::less<const std::type_info*> to use
 std::type_info::before(), and on Windows and Mac that Just Works. It even
 works on Linux when using gcc 4.4+: more recent implementations of gcc's
 std::type_info::before() apparently do name()-string comparisons internally.
 It doesn't work so well on Linux with gcc 4.1, though, and that's the
 compiler we still use on our Linux build-farm machines. But rather than give
 up, perform explicit name()-string comparison in that case.

---
 indra/llcommon/llstl.h | 59 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 19 deletions(-)

(limited to 'indra/llcommon/llstl.h')

diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
index 6109b21546..d3941e1bc9 100644
--- a/indra/llcommon/llstl.h
+++ b/indra/llcommon/llstl.h
@@ -471,6 +471,27 @@ llbind2nd(const _Operation& __oper, const _Tp& __x)
   return llbinder2nd<_Operation>(__oper, _Arg2_type(__x));
 }
 
+/**
+ * Compare std::type_info* pointers a la std::less. We break this out as a
+ * separate function for use in two different std::less specializations.
+ */
+inline
+bool before(const std::type_info* lhs, const std::type_info* rhs)
+{
+#if LL_LINUX && defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
+    // If we're building on Linux with gcc, and it's either gcc 3.x or
+    // 4.{0,1,2,3}, then we have to use a workaround. Note that we use gcc on
+    // Mac too, and some people build with gcc on Windows (cygwin or mingw).
+    // On Linux, different load modules may produce different type_info*
+    // pointers for the same type. Have to compare name strings to get good
+    // results.
+    return strcmp(lhs->name(), rhs->name()) < 0;
+#else  // not Linux, or gcc 4.4+
+    // Just use before(), as we normally would
+    return lhs->before(*rhs);
+#endif
+}
+
 /**
  * Specialize std::less<std::type_info*> to use std::type_info::before().
  * See MAINT-1175. It is NEVER a good idea to directly compare std::type_info*
@@ -479,25 +500,25 @@ llbind2nd(const _Operation& __oper, const _Tp& __x)
  */
 namespace std
 {
-    template <>
-    struct less<const std::type_info*>:
-        public std::binary_function<const std::type_info*, const std::type_info*, bool>
-    {
-        bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
-        {
-            return lhs->before(*rhs);
-        }
-    };
-
-    template <>
-    struct less<std::type_info*>:
-        public std::binary_function<std::type_info*, std::type_info*, bool>
-    {
-        bool operator()(std::type_info* lhs, std::type_info* rhs) const
-        {
-            return lhs->before(*rhs);
-        }
-    };
+	template <>
+	struct less<const std::type_info*>:
+		public std::binary_function<const std::type_info*, const std::type_info*, bool>
+	{
+		bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
+		{
+			return before(lhs, rhs);
+		}
+	};
+
+	template <>
+	struct less<std::type_info*>:
+		public std::binary_function<std::type_info*, std::type_info*, bool>
+	{
+		bool operator()(std::type_info* lhs, std::type_info* rhs) const
+		{
+			return before(lhs, rhs);
+		}
+	};
 } // std
 
 #endif // LL_LLSTL_H
-- 
cgit v1.2.3