From c52f8ca137b6bf75d72639d002ab8123ad26b580 Mon Sep 17 00:00:00 2001
From: Tammy Bailey <tammy@moz.com>
Date: Thu, 23 May 2019 12:01:42 -0700
Subject: [PATCH] Updated for Ubuntu 18.04/gcc 7.4; fixed compilation issues

---
 .travis.yml         | 2 +-
 Makefile            | 4 ++--
 deps/googletest     | 2 +-
 test/test-agent.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e07234a..9d6a68a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: false
-dist: trusty
+dist: bionic
 git:
   submodules: true
 compiler:
diff --git a/Makefile b/Makefile
index 47ef1ba..30abcef 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ BINARIES      =
 all: test release/librep.o $(BINARIES)
 
 $(GTEST_DIR)/libgtest.a:
-	g++ -isystem $(GTEST_DIR)/include -I$(GTEST_DIR) -pthread -c $(GTEST_DIR)/src/gtest-all.cc -o $(GTEST_DIR)/libgtest.a
+	g++ -std=c++11 -isystem $(GTEST_DIR)/include -I$(GTEST_DIR) -pthread -c $(GTEST_DIR)/src/gtest-all.cc -o $(GTEST_DIR)/libgtest.a
 
 # Release libraries
 release:
@@ -60,4 +60,4 @@ test: test-all
 	./scripts/check-coverage.sh $(PWD)
 
 clean:
-	rm -rf debug release test-all bench test/*.o deps/url-cpp/{debug,release}
+	rm -rf debug release test-all bench test/*.o test/*.gcda test/*.gcno deps/url-cpp/debug deps/url-cpp/release
diff --git a/deps/googletest b/deps/googletest
index ca102b1..88f0493 160000
--- a/deps/googletest
+++ b/deps/googletest
@@ -1 +1 @@
-Subproject commit ca102b1f9d1f4c8a8c6f7a87b3e80d0af4b8789f
+Subproject commit 88f0493098c8d9fd0f096c2158a0e56deb952d53
diff --git a/test/test-agent.cpp b/test/test-agent.cpp
index 509cd72..cd8f989 100644
--- a/test/test-agent.cpp
+++ b/test/test-agent.cpp
@@ -5,7 +5,7 @@
 TEST(AgentTest, Basic)
 {
     Rep::Agent agent = Rep::Agent("a.com").allow("/").disallow("/foo");
-    EXPECT_EQ(agent.directives().size(), 2);
+    EXPECT_EQ(agent.directives().size(), 2ul);
 }
 
 TEST(AgentTest, ChecksAllowed)