aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock_test.cc
diff options
context:
space:
mode:
authorBilly Donahue <BillyDonahue@users.noreply.github.com>2015-09-17 12:26:15 -0400
committerBilly Donahue <BillyDonahue@users.noreply.github.com>2015-09-17 12:26:15 -0400
commit31eb85ee6a651646b8f7b7923b5cacae521f8d8f (patch)
tree9f346d9bfb4c5769d59159ef812c7c00edeecd33 /googlemock/test/gmock_test.cc
parentde411c3e80120f8dcc2a3f4f62f3ca692c0431d7 (diff)
parent39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae (diff)
downloadgoogletest-31eb85ee6a651646b8f7b7923b5cacae521f8d8f.tar.gz
googletest-31eb85ee6a651646b8f7b7923b5cacae521f8d8f.tar.bz2
googletest-31eb85ee6a651646b8f7b7923b5cacae521f8d8f.zip
Merge pull request #589 from nomis52/master
Fix the googlemock autotools build.
Diffstat (limited to 'googlemock/test/gmock_test.cc')
-rw-r--r--googlemock/test/gmock_test.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/googlemock/test/gmock_test.cc b/googlemock/test/gmock_test.cc
index ae5e22c8..d8d0c57b 100644
--- a/googlemock/test/gmock_test.cc
+++ b/googlemock/test/gmock_test.cc
@@ -37,7 +37,6 @@
#include <string>
#include "gtest/gtest.h"
-#include "gtest/internal/custom/gtest.h"
#if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)