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
bd263344
"git@developer.sourcefind.cn:yangql/googletest.git" did not exist on "947aeab281f1b160d2db5045064be73c984f1ae6"
Commit
bd263344
authored
Jun 18, 2014
by
kosak
Browse files
Additional changes, to add support for Windows Phone and Windows RT
parent
96ddffe8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+5
-3
No files found.
include/gtest/internal/gtest-port.h
View file @
bd263344
...
...
@@ -917,7 +917,9 @@ using ::std::tuple_size;
# endif
#define GTEST_IS_THREADSAFE \
(GTEST_OS_WINDOWS || GTEST_HAS_PTHREAD)
(0 \
|| (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \
|| GTEST_HAS_PTHREAD)
#endif // GTEST_HAS_SEH
...
...
@@ -1465,7 +1467,7 @@ class Notification {
GTEST_DISALLOW_COPY_AND_ASSIGN_
(
Notification
);
};
# elif GTEST_OS_WINDOWS
# elif GTEST_OS_WINDOWS
&& !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
GTEST_API_
void
SleepMilliseconds
(
int
n
);
...
...
@@ -1600,7 +1602,7 @@ class ThreadWithParam : public ThreadWithParamBase {
# endif // GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
# if 0 // OS detection
# elif GTEST_OS_WINDOWS
# elif GTEST_OS_WINDOWS
&& !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
// Mutex implements mutex on Windows platforms. It is used in conjunction
// with class MutexLock:
...
...
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