summaryrefslogtreecommitdiffstats
path: root/googletest/include
diff options
context:
space:
mode:
authorKrystian Kuzniarek <krystian.kuzniarek@gmail.com>2019-09-10 12:14:17 (GMT)
committerKrystian Kuzniarek <krystian.kuzniarek@gmail.com>2019-09-11 08:45:51 (GMT)
commit0cd3fbc8abe649ac61f76b364a181f047a5e9e31 (patch)
treeed05aef223e071f00145bf96da7ed3e38dba2a40 /googletest/include
parentbafa644c182e0d9ed1c21d97b16305a07633ec2d (diff)
downloadgoogletest-0cd3fbc8abe649ac61f76b364a181f047a5e9e31.zip
googletest-0cd3fbc8abe649ac61f76b364a181f047a5e9e31.tar.gz
googletest-0cd3fbc8abe649ac61f76b364a181f047a5e9e31.tar.bz2
change includes in gtest-port.hrefs/pull/2454/head
Diffstat (limited to 'googletest/include')
-rw-r--r--googletest/include/gtest/gtest-message.h1
-rw-r--r--googletest/include/gtest/internal/gtest-port.h5
2 files changed, 2 insertions, 4 deletions
diff --git a/googletest/include/gtest/gtest-message.h b/googletest/include/gtest/gtest-message.h
index 4a80e11..2189923 100644
--- a/googletest/include/gtest/gtest-message.h
+++ b/googletest/include/gtest/gtest-message.h
@@ -49,6 +49,7 @@
#include <limits>
#include <memory>
+#include <sstream>
#include "gtest/internal/gtest-port.h"
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 29d9edf..2f351ec 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -248,7 +248,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <memory>
#include <type_traits>
#ifndef _WIN32_WCE
@@ -261,12 +260,10 @@
# include <TargetConditionals.h>
#endif
-#include <algorithm> // NOLINT
#include <iostream> // NOLINT
-#include <sstream> // NOLINT
+#include <memory>
#include <string> // NOLINT
#include <tuple>
-#include <utility>
#include <vector> // NOLINT
#include "gtest/internal/gtest-port-arch.h"