gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2454 from kuzkry:gtest-port-clean-up_dead-function

Browse Source 
PiperOrigin-RevId: 275838743
This commit is contained in:
Gennadiy Civil 2019-10-22 09:37:55 -04:00
commit 8ce64c084d
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
googletest/include/gtest/gtest-message.h
View File

@ -49,6 +49,7 @@
#include <limits> #include <limits>
#include <memory> #include <memory>
#include <sstream>
#include "gtest/internal/gtest-port.h" #include "gtest/internal/gtest-port.h"

11
googletest/include/gtest/internal/gtest-port.h
View File

@ -248,7 +248,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <memory>
#include <type_traits> #include <type_traits>
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
@ -261,16 +260,14 @@
# include <TargetConditionals.h> # include <TargetConditionals.h>
#endif #endif
#include <algorithm> // NOLINT
#include <iostream> // NOLINT #include <iostream> // NOLINT
#include <sstream> // NOLINT #include <memory>
#include <string> // NOLINT #include <string> // NOLINT
#include <tuple> #include <tuple>
#include <utility>
#include <vector> // NOLINT #include <vector> // NOLINT
#include "gtest/internal/gtest-port-arch.h"
#include "gtest/internal/custom/gtest-port.h" #include "gtest/internal/custom/gtest-port.h"
#include "gtest/internal/gtest-port-arch.h"
#if !defined(GTEST_DEV_EMAIL_) #if !defined(GTEST_DEV_EMAIL_)
# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com" # 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_() 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 // ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
// StrError() aren't needed on Windows CE at this time and thus not // StrError() aren't needed on Windows CE at this time and thus not
// defined there. // defined there.