diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-10-22 09:37:55 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-10-22 09:37:55 -0400 |
| commit | 8ce64c084d839c313e922b51519275dd8b0a24b7 (patch) | |
| tree | 06c939614b50ee712b48d190403faee74bb04c33 | |
| parent | 011c4e23d5254bed4b64099a3cb5233d4c4b76e8 (diff) | |
| parent | 0cd3fbc8abe649ac61f76b364a181f047a5e9e31 (diff) | |
| download | googletest-8ce64c084d839c313e922b51519275dd8b0a24b7.tar.gz googletest-8ce64c084d839c313e922b51519275dd8b0a24b7.tar.bz2 googletest-8ce64c084d839c313e922b51519275dd8b0a24b7.zip | |
Merge pull request #2454 from kuzkry:gtest-port-clean-up_dead-function
PiperOrigin-RevId: 275838743
| -rw-r--r-- | googletest/include/gtest/gtest-message.h | 1 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 15 |
2 files changed, 5 insertions, 11 deletions
diff --git a/googletest/include/gtest/gtest-message.h b/googletest/include/gtest/gtest-message.h index 4a80e11e..21899232 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 2b4770ff..c4b1aabe 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,16 +260,14 @@ # include <TargetConditionals.h> #endif -#include <algorithm> // NOLINT -#include <iostream> // NOLINT -#include <sstream> // NOLINT -#include <string> // NOLINT +#include <iostream> // NOLINT +#include <memory> +#include <string> // NOLINT #include <tuple> -#include <utility> #include <vector> // NOLINT -#include "gtest/internal/gtest-port-arch.h" #include "gtest/internal/custom/gtest-port.h" +#include "gtest/internal/gtest-port-arch.h" #if !defined(GTEST_DEV_EMAIL_) # define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com" @@ -2004,10 +2001,6 @@ inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); } GTEST_DISABLE_MSC_DEPRECATED_PUSH_() -inline const char* StrNCpy(char* dest, const char* src, size_t n) { - return strncpy(dest, src, n); -} - // ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and // StrError() aren't needed on Windows CE at this time and thus not // defined there. |