Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
bd263344
Commit
bd263344
authored
Jun 18, 2014
by
kosak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Additional changes, to add support for Windows Phone and Windows RT
parent
96ddffe8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
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;
...
@@ -917,7 +917,9 @@ using ::std::tuple_size;
# endif
# endif
#define GTEST_IS_THREADSAFE \
#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
#endif // GTEST_HAS_SEH
...
@@ -1465,7 +1467,7 @@ class Notification {
...
@@ -1465,7 +1467,7 @@ class Notification {
GTEST_DISALLOW_COPY_AND_ASSIGN_
(
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
);
GTEST_API_
void
SleepMilliseconds
(
int
n
);
...
@@ -1600,7 +1602,7 @@ class ThreadWithParam : public ThreadWithParamBase {
...
@@ -1600,7 +1602,7 @@ class ThreadWithParam : public ThreadWithParamBase {
# endif // GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
# endif // GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
# if 0 // OS detection
# 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
// Mutex implements mutex on Windows platforms. It is used in conjunction
// with class MutexLock:
// 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