diff options
| author | David Schuldenfrei <david.schuldenfrei@gmail.com> | 2018-09-06 17:06:11 +0300 |
|---|---|---|
| committer | David Schuldenfrei <david.schuldenfrei@gmail.com> | 2018-09-08 21:32:25 +0300 |
| commit | a2a15f2cefcfceaa6cee5b674a9b447359268ee9 (patch) | |
| tree | 4a08960671e45638a4c74f496562fb21e8bc7856 | |
| parent | 0614a539f011adfeca365f8c3f6447671bba0e04 (diff) | |
| download | googletest-a2a15f2cefcfceaa6cee5b674a9b447359268ee9.zip googletest-a2a15f2cefcfceaa6cee5b674a9b447359268ee9.tar.gz googletest-a2a15f2cefcfceaa6cee5b674a9b447359268ee9.tar.bz2 | |
Fix Compile error, and warning in Visaul Studio 2013
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 8 | ||||
| -rw-r--r-- | googletest/include/gtest/gtest-printers.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index a7bcfc8..41d7252 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -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: diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index 51865f8..3fddf83 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -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); } |