diff options
| author | KO Myung-Hun <komh@chollian.net> | 2018-10-11 17:29:33 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-11 17:31:25 (GMT) |
| commit | b3b19a796cbb3222fb3a49daf3f0a9378e8505ad (patch) | |
| tree | 3ca3d9b5d3ab6e5cf9d9562529dd2412a2dde141 /googletest/src | |
| parent | f203b2db77161fe54846ea9e839ebec81aeeccac (diff) | |
| download | googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.zip googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.tar.gz googletest-b3b19a796cbb3222fb3a49daf3f0a9378e8505ad.tar.bz2 | |
Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into f203b2db77161fe54846ea9e839ebec81aeeccac
Closes #1899
PiperOrigin-RevId: 216719020
Diffstat (limited to 'googletest/src')
| -rw-r--r-- | googletest/src/gtest-printers.cc | 2 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc index 3c0e758..12e6dbb 100644 --- a/googletest/src/gtest-printers.cc +++ b/googletest/src/gtest-printers.cc @@ -348,7 +348,7 @@ void PrintTo(const wchar_t* s, ostream* os) { *os << "NULL"; } else { *os << ImplicitCast_<const void*>(s) << " pointing to "; - PrintCharsAsStringTo(s, std::wcslen(s), os); + PrintCharsAsStringTo(s, wcslen(s), os); } } #endif // wchar_t is native diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index b0c9c97..8ae2572 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -445,7 +445,7 @@ static ::std::vector<std::string> g_argvs; FilePath GetCurrentExecutableName() { FilePath result; -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS || GTEST_OS_OS2 result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe")); #else result.Set(FilePath(GetArgvs()[0])); |