eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1817 from DavidSchuldenfrei/1.8.x/bugFix/CompileVS2013

Browse Source 
Fix Compile error, and warning in Visaul Studio 2013
This commit is contained in:
Gennadiy Civil 2018-09-13 10:36:51 -04:00 committed by GitHub
commit 792b475b9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
googlemock/include/gmock/gmock-matchers.h
View File

@ -56,11 +56,17 @@
# include <initializer_list> // NOLINT -- must be after gtest.h # include <initializer_list> // NOLINT -- must be after gtest.h
#endif #endif
#if _MSC_VER >= 1900
GTEST_DISABLE_MSC_WARNINGS_PUSH_( GTEST_DISABLE_MSC_WARNINGS_PUSH_(
4251 5046 /* class A needs to have dll-interface to be used by clients of 4251 5046 /* class A needs to have dll-interface to be used by clients of
class B */ class B */
/* Symbol involving type with internal linkage not defined */) /* Symbol involving type with internal linkage not defined */)
#else //Pragma 5046 doesn't exist in version of MSC prior to 1900
GTEST_DISABLE_MSC_WARNINGS_PUSH_(
4251 /* class A needs to have dll-interface to be used by clients of
class B */
/* Symbol involving type with internal linkage not defined */)
#endif
namespace testing { namespace testing {
// To implement a matcher Foo for type T, define: // To implement a matcher Foo for type T, define:

4
googletest/include/gtest/gtest-printers.h
View File

@ -983,7 +983,11 @@ struct TuplePolicy {
template <size_t I> template <size_t I>
static typename AddReference<const typename ::std::tr1::tuple_element< static typename AddReference<const typename ::std::tr1::tuple_element<
#if defined(_MSC_VER) && _MSC_VER < 1900
I, Tuple>::type>::type
#else
static_cast<int>(I), Tuple>::type>::type static_cast<int>(I), Tuple>::type>::type
#endif
get(const Tuple& tuple) { get(const Tuple& tuple) {
return ::std::tr1::get<I>(tuple); return ::std::tr1::get<I>(tuple);
} }