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
parent 0c799d0436 e1d41f3f9f
commit 792b475b9b
2 changed files with 11 additions and 1 deletions
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
#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: