summaryrefslogtreecommitdiffstats
path: root/googlemock/test
diff options
context:
space:
mode:
authorKrystian Kuzniarek <krystian.kuzniarek@gmail.com>2019-09-07 04:08:28 (GMT)
committerKrystian Kuzniarek <krystian.kuzniarek@gmail.com>2019-09-16 17:21:37 (GMT)
commit7c2bd3af981e9f257a0b61ce664953008c105dad (patch)
treef78df1d1d48cbefeedbd4d22fccea82c742d44f7 /googlemock/test
parentf2fb48c3b3d79a75a88a99fba6576b25d42ec528 (diff)
downloadgoogletest-7c2bd3af981e9f257a0b61ce664953008c105dad.zip
googletest-7c2bd3af981e9f257a0b61ce664953008c105dad.tar.gz
googletest-7c2bd3af981e9f257a0b61ce664953008c105dad.tar.bz2
square away the stuff that hasn't been merged in a manual review
This fixes up ab8f346b (a manual merge) that has abandoned some things from PR #2395.
Diffstat (limited to 'googlemock/test')
-rw-r--r--googlemock/test/gmock-internal-utils_test.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc
index d000e69..19ba6fe 100644
--- a/googlemock/test/gmock-internal-utils_test.cc
+++ b/googlemock/test/gmock-internal-utils_test.cc
@@ -40,7 +40,6 @@
#include <memory>
#include <sstream>
#include <string>
-#include <type_traits>
#include <vector>
#include "gmock/gmock.h"