Skip to content

Fix Compile error, and warning in Visaul Studio 2013 #1817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gennadiycivil merged 2 commits into from
Sep 13, 2018
Merged

Fix Compile error, and warning in Visaul Studio 2013 #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2a15f2
Fix Compile error, and warning in Visaul Studio 2013
DavidSchuldenfrei Sep 6, 2018
e1d41f3
Gennadiy's comment. Reverts to previous code if not using Visual Stud…
DavidSchuldenfrei Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion googlemock/include/gmock/gmock-matchers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions googletest/include/gtest/gtest-printers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,11 @@ struct TuplePolicy {

template <size_t I>
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
#endif
get(const Tuple& tuple) {
return ::std::tr1::get<I>(tuple);
}
Expand Down