Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
3899557c
"examples/vscode:/vscode.git/clone" did not exist on "b87cb97a53bcff92a90308528b3f313e43aff102"
Commit
3899557c
authored
Jul 12, 2010
by
vladlosev
Browse files
Fixes definitions from pthread.h used before the header inclusion.
parent
5e4214ce
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+6
-4
No files found.
include/gtest/internal/gtest-port.h
View file @
3899557c
...
@@ -379,6 +379,12 @@
...
@@ -379,6 +379,12 @@
#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC)
#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC)
#endif // GTEST_HAS_PTHREAD
#endif // GTEST_HAS_PTHREAD
#if GTEST_HAS_PTHREAD
// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
// true.
#include <pthread.h>
#endif
// Determines whether Google Test can use tr1/tuple. You can define
// Determines whether Google Test can use tr1/tuple. You can define
// this macro to 0 to prevent Google Test from using tuple (any
// this macro to 0 to prevent Google Test from using tuple (any
// feature depending on tuple with be disabled in this mode).
// feature depending on tuple with be disabled in this mode).
...
@@ -1089,10 +1095,6 @@ class ThreadWithParam : public ThreadWithParamBase {
...
@@ -1089,10 +1095,6 @@ class ThreadWithParam : public ThreadWithParamBase {
GTEST_DISALLOW_COPY_AND_ASSIGN_
(
ThreadWithParam
);
GTEST_DISALLOW_COPY_AND_ASSIGN_
(
ThreadWithParam
);
};
};
// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
// true.
#include <pthread.h>
// MutexBase and Mutex implement mutex on pthreads-based platforms. They
// MutexBase and Mutex implement mutex on pthreads-based platforms. They
// are used in conjunction with class MutexLock:
// are 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