diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-03-12 21:03:35 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-03-12 21:03:35 +0000 |
| commit | b5ef9876f39067bc370b816d62bde790a92806ca (patch) | |
| tree | 019e75c8071e764dcfb596b67ed655904c0e1447 /src | |
| parent | cc0116f14aa8ad9ab76226d082a96b1005221816 (diff) | |
| download | googletest-b5ef9876f39067bc370b816d62bde790a92806ca.tar.gz | |
Standards compliance changes to fix QNX build.
git-svn-id: http://googletest.googlecode.com/svn/trunk@678 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest-port.cc | 1 | ||||
| -rw-r--r-- | src/gtest-printers.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gtest-port.cc b/src/gtest-port.cc index 0c4df5f..a43f33d 100644 --- a/src/gtest-port.cc +++ b/src/gtest-port.cc @@ -53,6 +53,7 @@ #if GTEST_OS_QNX # include <devctl.h> +# include <fcntl.h> # include <sys/procfs.h> #endif // GTEST_OS_QNX diff --git a/src/gtest-printers.cc b/src/gtest-printers.cc index 29c799a..bb794ee 100644 --- a/src/gtest-printers.cc +++ b/src/gtest-printers.cc @@ -45,6 +45,7 @@ #include "gtest/gtest-printers.h" #include <ctype.h> #include <stdio.h> +#include <cwchar> #include <ostream> // NOLINT #include <string> #include "gtest/internal/gtest-port.h" @@ -335,7 +336,7 @@ void PrintTo(const wchar_t* s, ostream* os) { *os << "NULL"; } else { *os << ImplicitCast_<const void*>(s) << " pointing to "; - PrintCharsAsStringTo(s, wcslen(s), os); + PrintCharsAsStringTo(s, std::wcslen(s), os); } } #endif // wchar_t is native |