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
aa14cc42
Commit
aa14cc42
authored
Apr 04, 2018
by
Gennadiy Civil
Browse files
Fixing build break on MSVC
parent
0f790fa5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
googlemock/test/gmock-matchers_test.cc
googlemock/test/gmock-matchers_test.cc
+1
-1
No files found.
googlemock/test/gmock-matchers_test.cc
View file @
aa14cc42
...
@@ -696,7 +696,7 @@ TEST(MatcherCastTest, FromSameType) {
...
@@ -696,7 +696,7 @@ TEST(MatcherCastTest, FromSameType) {
struct ConvertibleFromAny {
struct ConvertibleFromAny {
ConvertibleFromAny(int a_value) : value(a_value) {}
ConvertibleFromAny(int a_value) : value(a_value) {}
template <typename T>
template <typename T>
ConvertibleFromAny
(
const
T
&
/*a_value*/
)
:
value
(
-
1
)
{
explicit
ConvertibleFromAny(const T& /*a_value*/) : value(-1) {
ADD_FAILURE() << "Conversion constructor called";
ADD_FAILURE() << "Conversion constructor called";
}
}
int value;
int value;
...
...
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