From owner-svn-src-projects@freebsd.org Mon Feb 19 12:23:18 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20F70F21B3B for ; Mon, 19 Feb 2018 12:23:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C1572721A1; Mon, 19 Feb 2018 12:23:17 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC1AB1A809; Mon, 19 Feb 2018 12:23:17 +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 w1JCNHgs058019; Mon, 19 Feb 2018 12:23:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCNHet058017; Mon, 19 Feb 2018 12:23:17 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191223.w1JCNHet058017@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:23:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329566 - projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc X-SVN-Commit-Revision: 329566 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Feb 2018 12:23:18 -0000 Author: hselasky Date: Mon Feb 19 12:23:17 2018 New Revision: 329566 URL: https://svnweb.freebsd.org/changeset/base/329566 Log: MFC r326716: Correctly define the unordered_map namespace in ofed/libibnetdisc . This should fix ofed/libibnetdisc compilation with C-compilers different from clang and GCC v4.2.1. Submitted by: kib Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/g_hash_table.cpp Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile ============================================================================== --- projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile Mon Feb 19 12:21:56 2018 (r329565) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile Mon Feb 19 12:23:17 2018 (r329566) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .PATH: ${.CURDIR} ${.CURDIR}/man SHLIBDIR?= /usr/lib @@ -28,6 +30,9 @@ LIBADD= osmcomp ibmad ibumad CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR} CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband +.if ${COMPILER_FEATURES:Mc++11} +CXXFLAGS+= -std=c++11 +.endif VERSION_MAP= ${.CURDIR}/libibnetdisc.map .include Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/g_hash_table.cpp ============================================================================== --- projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/g_hash_table.cpp Mon Feb 19 12:21:56 2018 (r329565) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/g_hash_table.cpp Mon Feb 19 12:23:17 2018 (r329566) @@ -31,17 +31,17 @@ * */ -#if defined(__clang__) +#if __cplusplus >= 201103L #include -#define HASH_TABLE_UNORDERED_MAP std::unordered_map +#define UM_NAMESPACE std #else #include -#define HASH_TABLE_UNORDERED_MAP std::tr1::unordered_map +#define UM_NAMESPACE std::tr1 #endif class HashTable { public: - HASH_TABLE_UNORDERED_MAP map; + UM_NAMESPACE::unordered_map map; HashTable() { }; ~HashTable() { }; };