eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Standards compliance changes to fix QNX build.

Browse Source
This commit is contained in:
kosak 2014-03-12 21:03:35 +00:00
parent 41a8bc67ab
commit 134389c044
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gtest-port.cc
View File

@ -53,6 +53,7 @@
#if GTEST_OS_QNX #if GTEST_OS_QNX
# include <devctl.h> # include <devctl.h>
# include <fcntl.h>
# include <sys/procfs.h> # include <sys/procfs.h>
#endif // GTEST_OS_QNX #endif // GTEST_OS_QNX

3
src/gtest-printers.cc
View File

@ -45,6 +45,7 @@
#include "gtest/gtest-printers.h" #include "gtest/gtest-printers.h"
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <cwchar>
#include <ostream> // NOLINT #include <ostream> // NOLINT
#include <string> #include <string>
#include "gtest/internal/gtest-port.h" #include "gtest/internal/gtest-port.h"
@ -335,7 +336,7 @@ void PrintTo(const wchar_t* s, ostream* os) {
*os << "NULL"; *os << "NULL";
} else { } else {
*os << ImplicitCast_<const void*>(s) << " pointing to "; *os << ImplicitCast_<const void*>(s) << " pointing to ";
PrintCharsAsStringTo(s, wcslen(s), os); PrintCharsAsStringTo(s, std::wcslen(s), os);
} }
} }
#endif // wchar_t is native #endif // wchar_t is native