From 25dddb9369dbba08b0e9788830692a683ab2cf75 Mon Sep 17 00:00:00 2001
From: greg <greg7mdp@gmail.com>
Date: Wed, 27 Mar 2019 20:55:20 -0400
Subject: [PATCH] fix some build issues with c++14/17

---
 .travis.yml                    | 97 +---------------------------------
 parallel_hashmap/phmap_base.h  |  2 +-
 tests/hash_generator_testing.h |  1 +
 3 files changed, 3 insertions(+), 97 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 459292a..0190f36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,101 +2,6 @@ language: cpp
 matrix:
   include:
 
-    - os: osx
-      compiler: gcc
-      env: COMPILER='g++' CXXSTD='c++11'
-
-    - os: osx
-      compiler: clang
-      env: COMPILER='clang++' CXXSTD='c++11'
-
-    - os: linux
-      compiler: gcc
-      env: COMPILER='g++' CXXSTD='c++11'
-
-    - os: linux
-      compiler: clang
-      env: COMPILER='clang++' CXXSTD='c++11'
-
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: 
-            - ubuntu-toolchain-r-test
-          packages: 
-            - g++-5
-      env: COMPILER='g++-5' CXXSTD='c++11'
-
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: 
-            - ubuntu-toolchain-r-test
-          packages: 
-            - g++-6
-      env: COMPILER='g++-6' CXXSTD='c++11'
-
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: 
-            - ubuntu-toolchain-r-test
-          packages: 
-            - g++-7
-      env: COMPILER='g++-7' CXXSTD='c++11'
-
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: 
-            - ubuntu-toolchain-r-test
-          packages: 
-            - g++-8
-      env: COMPILER='g++-8' CXXSTD='c++14'
-
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: 
-            - ubuntu-toolchain-r-test
-          packages: 
-            - g++-8
-      env: COMPILER='g++-8' CXXSTD='c++17'
-
-    - os: linux
-      compiler: clang
-      addons:
-        apt:
-          sources: 
-            - llvm-toolchain-trusty-3.9
-          packages:
-            - clang-3.9
-      env: COMPILER='clang++-3.9' CXXSTD='c++11'
-
-    - os: linux
-      compiler: clang
-      addons:
-        apt:
-          sources: 
-            - llvm-toolchain-trusty-4.0
-          packages:
-            - clang-4.0
-      env: COMPILER='clang++-4.0' CXXSTD='c++11'
-
-    - os: linux
-      compiler: clang
-      addons:
-        apt:
-          sources: 
-            - llvm-toolchain-trusty-5.0
-          packages:
-            - clang-5.0
-      env: COMPILER='clang++-5.0' CXXSTD='c++14'
 
     - os: linux
       compiler: clang
@@ -112,4 +17,4 @@ dist: trusty
 sudo: false
 
 script: 
-  mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=${COMPILER} -DCXXFLAGS="-std=${CXXSTD}" .. && cmake --build . && make test
+  mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=${COMPILER} -DCXXFLAGS="-std=${CXXSTD}" .. && cmake --build . -- VERBOSE=1 && make test
diff --git a/parallel_hashmap/phmap_base.h b/parallel_hashmap/phmap_base.h
index 7d1526c..58a3764 100644
--- a/parallel_hashmap/phmap_base.h
+++ b/parallel_hashmap/phmap_base.h
@@ -45,7 +45,7 @@
 #include <functional>
 #include <tuple>
 #include <utility>
-
+#include <memory>
 
 #include "phmap_config.h"
 
diff --git a/tests/hash_generator_testing.h b/tests/hash_generator_testing.h
index 6997c1d..76faafa 100644
--- a/tests/hash_generator_testing.h
+++ b/tests/hash_generator_testing.h
@@ -26,6 +26,7 @@
 #include <type_traits>
 #include <utility>
 #include <string>
++#include <deque>
 #include <functional>
 
 #if PHMAP_HAVE_STD_STRING_VIEW