Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
134389c0
Commit
134389c0
authored
Mar 12, 2014
by
kosak
Browse files
Standards compliance changes to fix QNX build.
parent
41a8bc67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
src/gtest-port.cc
src/gtest-port.cc
+1
-0
src/gtest-printers.cc
src/gtest-printers.cc
+2
-1
No files found.
src/gtest-port.cc
View file @
134389c0
...
@@ -53,6 +53,7 @@
...
@@ -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
...
...
src/gtest-printers.cc
View file @
134389c0
...
@@ -45,6 +45,7 @@
...
@@ -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) {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment