Fixing up gtest to work with scons (better!)
This commit is contained in:
parent
47ca68760a
commit
301a7fa525
5 changed files with 14 additions and 4 deletions
|
@ -1380,6 +1380,9 @@ class MutexBase {
|
|||
# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
|
||||
extern ::testing::internal::MutexBase mutex
|
||||
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
|
||||
// Defines and statically (i.e. at link time) initializes a static mutex.
|
||||
// The initialization list here does not explicitly initialize each field,
|
||||
// instead relying on default initialization for the unspecified fields. In
|
||||
|
@ -1389,6 +1392,8 @@ class MutexBase {
|
|||
# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
|
||||
::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false }
|
||||
|
||||
#pragma clang diagnostic pop
|
||||
|
||||
// The Mutex class can only be used for mutexes created at runtime. It
|
||||
// shares its API with MutexBase otherwise.
|
||||
class Mutex : public MutexBase {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue