From owner-svn-src-all@FreeBSD.ORG  Sat Jan 31 23:08:30 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B4D40D89;
 Sat, 31 Jan 2015 23:08:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A05897E0;
 Sat, 31 Jan 2015 23:08:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0VN8Uru059193;
 Sat, 31 Jan 2015 23:08:30 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0VN8UgD059192;
 Sat, 31 Jan 2015 23:08:30 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201501312308.t0VN8UgD059192@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 31 Jan 2015 23:08:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278010 - head/contrib/libcxxrt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jan 2015 23:08:30 -0000

Author: dim
Date: Sat Jan 31 23:08:29 2015
New Revision: 278010
URL: https://svnweb.freebsd.org/changeset/base/278010

Log:
  Revert r256642, not only to reduce diffs against upstream libcxxrt, but
  also because it is the wrong approach: comparing typeinfo names deeply
  causes trouble if two loaded DSOs use independent types of the same
  name.
  
  In addition, this particular change was never merged to FreeBSD 10.x and
  9.x, so let's get rid of it before it ends up in an 11.x release.
  
  Discussed with:	theraven, joerg@netbsd

Modified:
  head/contrib/libcxxrt/typeinfo.cc

Modified: head/contrib/libcxxrt/typeinfo.cc
==============================================================================
--- head/contrib/libcxxrt/typeinfo.cc	Sat Jan 31 23:02:27 2015	(r278009)
+++ head/contrib/libcxxrt/typeinfo.cc	Sat Jan 31 23:08:29 2015	(r278010)
@@ -35,23 +35,15 @@ type_info::~type_info() {}
 
 bool type_info::operator==(const type_info &other) const
 {
-#ifdef LIBCXXRT_MERGED_TYPEINFO
 	return __type_name == other.__type_name;
-#else
-	return __type_name == other.__type_name || strcmp(__type_name, other.__type_name) == 0;
-#endif
 }
 bool type_info::operator!=(const type_info &other) const
 {
-	return !operator==(other);
+	return __type_name != other.__type_name;
 }
 bool type_info::before(const type_info &other) const
 {
-#ifdef LIBCXXRT_MERGED_TYPEINFO
 	return __type_name < other.__type_name;
-#else
-	return strcmp(__type_name, other.__type_name) < 0;
-#endif
 }
 const char* type_info::name() const
 {