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
569d713a
Commit
569d713a
authored
Aug 14, 2017
by
gpetit
Committed by
Gaspard Petit
Jan 12, 2018
Browse files
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
parent
ed8d02cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
googletest/include/gtest/internal/gtest-port-arch.h
googletest/include/gtest/internal/gtest-port-arch.h
+3
-0
googletest/src/gtest.cc
googletest/src/gtest.cc
+1
-1
No files found.
googletest/include/gtest/internal/gtest-port-arch.h
View file @
569d713a
...
...
@@ -54,6 +54,9 @@
# define GTEST_OS_WINDOWS_PHONE 1
# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
# define GTEST_OS_WINDOWS_RT 1
# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE)
# define GTEST_OS_WINDOWS_PHONE 1
# define GTEST_OS_WINDOWS_TV_TITLE 1
# else
// WINAPI_FAMILY defined but no known partition matched.
// Default to desktop.
...
...
googletest/src/gtest.cc
View file @
569d713a
...
...
@@ -1655,7 +1655,7 @@ namespace {
AssertionResult
HRESULTFailureHelper
(
const
char
*
expr
,
const
char
*
expected
,
long
hr
)
{
// NOLINT
# if GTEST_OS_WINDOWS_MOBILE
# if GTEST_OS_WINDOWS_MOBILE
|| GTEST_OS_WINDOWS_TV_TITLE
// Windows CE doesn't support FormatMessage.
const
char
error_text
[]
=
""
;
...
...
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