..and this should be it
This commit is contained in:
parent
d0923d2754
commit
797c6f1be1
|
@ -48,6 +48,14 @@
|
||||||
namespace testing {
|
namespace testing {
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
|
// Silence MSVC C4100 (unreferenced formal parameter) and
|
||||||
|
// C4805('==': unsafe mix of type 'const int' and type 'const bool')
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# pragma warning(push)
|
||||||
|
# pragma warning(disable:4100)
|
||||||
|
# pragma warning(disable:4805)
|
||||||
|
#endif
|
||||||
|
|
||||||
// Joins a vector of strings as if they are fields of a tuple; returns
|
// Joins a vector of strings as if they are fields of a tuple; returns
|
||||||
// the joined string.
|
// the joined string.
|
||||||
GTEST_API_ std::string JoinAsTuple(const Strings& fields);
|
GTEST_API_ std::string JoinAsTuple(const Strings& fields);
|
||||||
|
@ -510,7 +518,7 @@ struct BooleanConstant {};
|
||||||
|
|
||||||
// Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
|
// Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
|
||||||
// reduce code size.
|
// reduce code size.
|
||||||
void IllegalDoDefault(const char* file, int line);
|
GTEST_API_ void IllegalDoDefault(const char* file, int line);
|
||||||
|
|
||||||
#if GTEST_LANG_CXX11
|
#if GTEST_LANG_CXX11
|
||||||
// Helper types for Apply() below.
|
// Helper types for Apply() below.
|
||||||
|
@ -539,6 +547,12 @@ auto Apply(F&& f, Tuple&& args)
|
||||||
make_int_pack<std::tuple_size<Tuple>::value>());
|
make_int_pack<std::tuple_size<Tuple>::value>());
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
# pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
} // namespace testing
|
} // namespace testing
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user