eryn/base-cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing up gtest to work with scons (better!)

Browse source
This commit is contained in:
Eryn Wells 2014-02-28 17:37:52 -08:00
parent 47ca68760a
commit 301a7fa525
5 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/gtest/gtest.cc
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
@ -366,9 +366,14 @@ void AssertHelper::operator=(const Message& message) const {
); // NOLINT
}
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
// Mutex for linked pointers.
GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex);
#pragma clang diagnostic pop
// Application pathname gotten in InitGoogleTest.
std::string g_executable_path;