organicmaps/travelguide
Archived
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed googletest includes.

Browse source
This commit is contained in:
vng 2013-08-05 00:36:00 +03:00
parent 03fa69f534
commit a65a3a2bb7
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3rdparty/googletest/include/gtest/internal/gtest-port.h vendored
View file

@ -1387,7 +1387,7 @@ class MutexBase {
// This allows initialization to work whether pthread_t is a scalar or struct.
// The flag -Wmissing-field-initializers must not be specified for this to work.
# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false }
::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false, 0 }
// The Mutex class can only be used for mutexes created at runtime. It
// shares its API with MutexBase otherwise.

14
3rdparty/googletest/src/gtest-all.cc vendored
View file

@ -39,10 +39,10 @@
#include "gtest/gtest.h"
// The following lines pull in the real gtest *.cc files.
#include "src/gtest.cc"
#include "src/gtest-death-test.cc"
#include "src/gtest-filepath.cc"
#include "src/gtest-port.cc"
#include "src/gtest-printers.cc"
#include "src/gtest-test-part.cc"
#include "src/gtest-typed-test.cc"
#include "gtest.cc"
#include "gtest-death-test.cc"
#include "gtest-filepath.cc"
#include "gtest-port.cc"
#include "gtest-printers.cc"
#include "gtest-test-part.cc"
#include "gtest-typed-test.cc"

2
3rdparty/googletest/src/gtest-death-test.cc vendored
View file

@ -72,7 +72,7 @@
// prevent a user from accidentally including gtest-internal-inl.h in
// his code.
#define GTEST_IMPLEMENTATION_ 1
#include "src/gtest-internal-inl.h"
#include "gtest-internal-inl.h"
#undef GTEST_IMPLEMENTATION_
namespace testing {

2
3rdparty/googletest/src/gtest-port.cc vendored
View file

@ -67,7 +67,7 @@
// prevent a user from accidentally including gtest-internal-inl.h in
// his code.
#define GTEST_IMPLEMENTATION_ 1
#include "src/gtest-internal-inl.h"
#include "gtest-internal-inl.h"
#undef GTEST_IMPLEMENTATION_
namespace testing {

2
3rdparty/googletest/src/gtest-test-part.cc vendored
View file

@ -39,7 +39,7 @@
// prevent a user from accidentally including gtest-internal-inl.h in
// his code.
#define GTEST_IMPLEMENTATION_ 1
#include "src/gtest-internal-inl.h"
#include "gtest-internal-inl.h"
#undef GTEST_IMPLEMENTATION_
namespace testing {

2
3rdparty/googletest/src/gtest.cc vendored
View file

@ -132,7 +132,7 @@
// prevent a user from accidentally including gtest-internal-inl.h in
// his code.
#define GTEST_IMPLEMENTATION_ 1
#include "src/gtest-internal-inl.h"
#include "gtest-internal-inl.h"
#undef GTEST_IMPLEMENTATION_
#if GTEST_OS_WINDOWS