d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly define the unordered_map namespace in ofed/libibnetdisc .

Browse Source 
This should fix ofed/libibnetdisc compilation with C-compilers
different from clang and GCC v4.2.1.

Submitted by:	kib
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2017-12-08 21:01:09 +00:00
parent f0408ed054
commit 656371d7c1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/ofed/libibnetdisc/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
.include <src.opts.mk>
.PATH: ${.CURDIR} ${.CURDIR}/man .PATH: ${.CURDIR} ${.CURDIR}/man
SHLIBDIR?= /usr/lib SHLIBDIR?= /usr/lib
@ -28,6 +30,9 @@ LIBADD= osmcomp ibmad ibumad
CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -DHAVE_CONFIG_H=1
CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
.if ${COMPILER_FEATURES:Mc++11}
CXXFLAGS+= -std=c++11
.endif
VERSION_MAP= ${.CURDIR}/libibnetdisc.map VERSION_MAP= ${.CURDIR}/libibnetdisc.map
.include <bsd.lib.mk> .include <bsd.lib.mk>

8
contrib/ofed/libibnetdisc/g_hash_table.cpp
View File

@ -31,17 +31,17 @@
* *
*/ */
#if defined(__clang__) #if __cplusplus >= 201103L
#include <unordered_map> #include <unordered_map>
#define HASH_TABLE_UNORDERED_MAP std::unordered_map #define UM_NAMESPACE std
#else #else
#include <tr1/unordered_map> #include <tr1/unordered_map>
#define HASH_TABLE_UNORDERED_MAP std::tr1::unordered_map #define UM_NAMESPACE std::tr1
#endif #endif
class HashTable { class HashTable {
public: public:
HASH_TABLE_UNORDERED_MAP<void *, void *> map; UM_NAMESPACE::unordered_map<void *, void *> map;
HashTable() { }; HashTable() { };
~HashTable() { }; ~HashTable() { };
}; };