Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
1c2f1907
Unverified
Commit
1c2f1907
authored
Jan 02, 2018
by
Gennadiy Civil
Committed by
GitHub
Jan 02, 2018
Browse files
Merge pull request #1109 from davidben/vs2017
Avoid warning C4619 in MSVC 2017.
parents
5490beb0
bcd35523
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
googletest/include/gtest/gtest.h
googletest/include/gtest/gtest.h
+4
-0
No files found.
googletest/include/gtest/gtest.h
View file @
1c2f1907
...
...
@@ -259,7 +259,9 @@ class GTEST_API_ AssertionResult {
// Used in EXPECT_TRUE/FALSE(assertion_result).
AssertionResult
(
const
AssertionResult
&
other
);
#if defined(_MSC_VER) && _MSC_VER < 1910
GTEST_DISABLE_MSC_WARNINGS_PUSH_
(
4800
/* forcing value to bool */
)
#endif
// Used in the EXPECT_TRUE/FALSE(bool_expression).
//
...
...
@@ -276,7 +278,9 @@ class GTEST_API_ AssertionResult {
/*enabler*/
=
NULL
)
:
success_
(
success
)
{}
#if defined(_MSC_VER) && _MSC_VER < 1910
GTEST_DISABLE_MSC_WARNINGS_POP_
()
#endif
// Assignment operator.
AssertionResult
&
operator
=
(
AssertionResult
other
)
{
...
...
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