saberbud/parallel-hashmap
1
0
Fork 0
mirror of https://github.com/greg7mdp/parallel-hashmap.git synced 2026-08-29 08:34:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix travis clang build

Browse Source
This commit is contained in:
greg
2019-03-27 21:30:25 -04:00
parent 87dedf7b3c
commit 65ebd67804
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
Vendored
+2 -1
View File
@@ -10,6 +10,7 @@ matrix:
sources:
- llvm-toolchain-trusty-5.0
packages:
- g++-8
- clang-5.0
env: COMPILER='clang++-5.0' CXXSTD='c++17'
@@ -17,4 +18,4 @@ dist: trusty
sudo: false
script:
mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=${COMPILER} -DCXXFLAGS="-std=${CXXSTD}" .. && cmake --build . -- VERBOSE=1 && make test
mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=${COMPILER} -DCXXFLAGS="-std=${CXXSTD}" .. && cmake --build . && make test
parallel_hashmap/phmap_base.h
Vendored
+1 -2
View File
@@ -1264,8 +1264,7 @@ struct MakeUniqueResult<T[N]> {
} // namespace memory_internal
#if (__cplusplus > 201103L || defined(_MSC_VER)) && \
!(defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) && \
!(defined (__GLIBCXX__) && __GLIBCXX__ <= 20151030)
!(defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 8)
using std::make_unique;
#else