diff options
| author | kosak <kosak@google.com> | 2014-03-12 21:03:35 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-03-12 21:03:35 +0000 |
| commit | 134389c0446c786ee1170f7cf60b9ff1dd78d56f (patch) | |
| tree | 019e75c8071e764dcfb596b67ed655904c0e1447 /src | |
| parent | 41a8bc67ab7e7a81735e9d560f54d8d130dcc3ab (diff) | |
| download | googletest-134389c0446c786ee1170f7cf60b9ff1dd78d56f.tar.gz googletest-134389c0446c786ee1170f7cf60b9ff1dd78d56f.tar.bz2 googletest-134389c0446c786ee1170f7cf60b9ff1dd78d56f.zip | |
Standards compliance changes to fix QNX build.
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 0c4df5f2..a43f33d7 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 29c799a5..bb794eed 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 |