Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
9ad73983
Unverified
Commit
9ad73983
authored
Aug 29, 2018
by
Gennadiy Civil
Committed by
GitHub
Aug 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update gmock-matchers.h
parent
1db4a426
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
gmock-matchers.h
googlemock/include/gmock/gmock-matchers.h
+4
-3
No files found.
googlemock/include/gmock/gmock-matchers.h
View file @
9ad73983
...
...
@@ -56,8 +56,9 @@
# include <initializer_list> // NOLINT -- must be after gtest.h
#endif
GTEST_DISABLE_MSC_WARNINGS_PUSH_
(
4251
\
/* class A needs to have dll-interface to be used by clients of class B */
)
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 */
)
namespace
testing
{
...
...
@@ -5270,7 +5271,7 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
}
// namespace testing
GTEST_DISABLE_MSC_WARNINGS_POP_
()
// 4251
GTEST_DISABLE_MSC_WARNINGS_POP_
()
// 4251
5046
// Include any custom callback matchers added by the local installation.
// We must include this header at the end to make sure it can use the
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment