From 66de13288e0353a2d5f5961abf2bbc523f4e22cb Mon Sep 17 00:00:00 2001 From: greg Date: Sun, 24 Mar 2019 18:44:50 -0400 Subject: [PATCH] all tests pass --- CMakeLists.txt | 4 ++++ tests/parallel_flat_hash_set_test.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9fbd62..d37aecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,10 @@ option(PHMAP_BUILD_TESTS "Whether or not to build the tests" OFF) option(PHMAP_BUILD_EXAMPLES "Whether or not to build the examples" OFF) if (PHMAP_BUILD_TESTS) + if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") + endif() + include(cmake/DownloadGTest.cmake) check_target(gtest) diff --git a/tests/parallel_flat_hash_set_test.cc b/tests/parallel_flat_hash_set_test.cc index 046c34d..7e208e3 100644 --- a/tests/parallel_flat_hash_set_test.cc +++ b/tests/parallel_flat_hash_set_test.cc @@ -20,8 +20,6 @@ #include "unordered_set_constructor_test.h" #include "unordered_set_lookup_test.h" #include "unordered_set_modifiers_test.h" -#include "absl/memory/memory.h" -#include "absl/strings/string_view.h" namespace phmap { namespace container_internal { @@ -44,11 +42,13 @@ INSTANTIATE_TYPED_TEST_SUITE_P(ParallelFlatHashSet, ConstructorTest, SetTypes); INSTANTIATE_TYPED_TEST_SUITE_P(ParallelFlatHashSet, LookupTest, SetTypes); INSTANTIATE_TYPED_TEST_SUITE_P(ParallelFlatHashSet, ModifiersTest, SetTypes); +#if PHMAP_HAVE_STD_STRING_VIEW TEST(ParallelFlatHashSet, EmplaceString) { std::vector v = {"a", "b"}; phmap::parallel_flat_hash_set hs(v.begin(), v.end()); EXPECT_THAT(hs, UnorderedElementsAreArray(v)); } +#endif TEST(ParallelFlatHashSet, BitfieldArgument) { union {