From owner-svn-src-projects@freebsd.org  Fri Nov 17 15:23:43 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59902DDCAF1
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri, 17 Nov 2017 15:23:43 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 2611B6A260;
 Fri, 17 Nov 2017 15:23:43 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAHFNgZ1074093;
 Fri, 17 Nov 2017 15:23:42 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAHFNgrl074092;
 Fri, 17 Nov 2017 15:23:42 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201711171523.vAHFNgrl074092@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 17 Nov 2017 15:23:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r325935 - projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc
X-SVN-Group: projects
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc
X-SVN-Commit-Revision: 325935
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Nov 2017 15:23:43 -0000

Author: hselasky
Date: Fri Nov 17 15:23:42 2017
New Revision: 325935
URL: https://svnweb.freebsd.org/changeset/base/325935

Log:
  Fix compilation of libibnetdisc using in-base GCC v4.2.1.
  
  Sponsored by:	Mellanox Technologies

Modified:
  projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/g_hash_table.cpp

Modified: projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/g_hash_table.cpp
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/g_hash_table.cpp	Fri Nov 17 13:12:20 2017	(r325934)
+++ projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/g_hash_table.cpp	Fri Nov 17 15:23:42 2017	(r325935)
@@ -31,11 +31,17 @@
  *
  */
 
+#if defined(__clang__)
 #include <unordered_map>
+#define	HASH_TABLE_UNORDERED_MAP std::unordered_map
+#else
+#include <tr1/unordered_map>
+#define	HASH_TABLE_UNORDERED_MAP std::tr1::unordered_map
+#endif
 
 class HashTable {
 public:
-	std::unordered_map<void *, void *> map;
+	HASH_TABLE_UNORDERED_MAP<void *, void *> map;
 	HashTable() { };
 	~HashTable() { };
 };