From 65ebd678047934df6e302be5c05a2a2c5c3d3f4f Mon Sep 17 00:00:00 2001 From: greg Date: Wed, 27 Mar 2019 21:30:25 -0400 Subject: [PATCH] fix travis clang build --- .travis.yml | 3 ++- parallel_hashmap/phmap_base.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0190f36..aa9cc83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/parallel_hashmap/phmap_base.h b/parallel_hashmap/phmap_base.h index 40e2285..9814642 100644 --- a/parallel_hashmap/phmap_base.h +++ b/parallel_hashmap/phmap_base.h @@ -1264,8 +1264,7 @@ struct MakeUniqueResult { } // 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