this should be it
This commit is contained in:
parent
f5871009e6
commit
c1d4c34233
|
@ -87,9 +87,7 @@ namespace testing {
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# pragma warning(push)
|
# pragma warning(push)
|
||||||
# pragma warning(disable:4805)
|
# pragma warning(disable:4805)
|
||||||
# if _MSC_VER <= 1900
|
|
||||||
# pragma warning(disable:4100)
|
# pragma warning(disable:4100)
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -2310,9 +2308,7 @@ bool StaticAssertTypeEq() {
|
||||||
GTEST_API_ std::string TempDir();
|
GTEST_API_ std::string TempDir();
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if _MSC_VER <= 1900
|
|
||||||
# pragma warning(pop)
|
# pragma warning(pop)
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} // namespace testing
|
} // namespace testing
|
||||||
|
|
Loading…
Reference in New Issue
Block a user