Fix Compile error, and warning in Visaul Studio 2013
This commit is contained in:
parent
0614a539f0
commit
a2a15f2cef
|
@ -56,11 +56,17 @@
|
|||
# include <initializer_list> // NOLINT -- must be after gtest.h
|
||||
#endif
|
||||
|
||||
#if _MSC_VER >= 1900
|
||||
GTEST_DISABLE_MSC_WARNINGS_PUSH_(
|
||||
4251 5046 /* class A needs to have dll-interface to be used by clients of
|
||||
class B */
|
||||
/* 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 {
|
||||
|
||||
// To implement a matcher Foo for type T, define:
|
||||
|
|
|
@ -983,7 +983,7 @@ struct TuplePolicy {
|
|||
|
||||
template <size_t I>
|
||||
static typename AddReference<const typename ::std::tr1::tuple_element<
|
||||
static_cast<int>(I), Tuple>::type>::type
|
||||
I, Tuple>::type>::type
|
||||
get(const Tuple& tuple) {
|
||||
return ::std::tr1::get<I>(tuple);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user