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
389bad61
Commit
389bad61
authored
Nov 17, 2014
by
kosak
Browse files
Silence a signedness-comparison warning in gmock-actions_test.
include <functional> when using std::function in gmock.
parent
3d1c78b2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
include/gmock/gmock-generated-function-mockers.h
include/gmock/gmock-generated-function-mockers.h
+4
-0
include/gmock/gmock-generated-function-mockers.h.pump
include/gmock/gmock-generated-function-mockers.h.pump
+4
-0
test/gmock-actions_test.cc
test/gmock-actions_test.cc
+2
-2
No files found.
include/gmock/gmock-generated-function-mockers.h
View file @
389bad61
...
...
@@ -43,6 +43,10 @@
#include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-internal-utils.h"
#if GTEST_HAS_STD_FUNCTION_
# include <functional>
#endif
namespace
testing
{
namespace
internal
{
...
...
include/gmock/gmock-generated-function-mockers.h.pump
View file @
389bad61
...
...
@@ -44,6 +44,10 @@ $var n = 10 $$ The maximum arity we support.
#include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-internal-utils.h"
#if GTEST_HAS_STD_FUNCTION_
# include <functional>
#endif
namespace
testing
{
namespace
internal
{
...
...
test/gmock-actions_test.cc
View file @
389bad61
...
...
@@ -1301,7 +1301,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Return) {
EXPECT_EQ
(
19
,
*
result1
);
std
::
vector
<
std
::
unique_ptr
<
int
>>
vresult
=
mock
.
MakeVectorUnique
();
EXPECT_EQ
(
1
,
vresult
.
size
());
EXPECT_EQ
(
1
u
,
vresult
.
size
());
EXPECT_NE
(
nullptr
,
vresult
[
0
]);
EXPECT_EQ
(
7
,
*
vresult
[
0
]);
...
...
@@ -1341,7 +1341,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Invoke) {
EXPECT_NE
(
result1
,
result2
);
std
::
vector
<
std
::
unique_ptr
<
int
>>
vresult
=
mock
.
MakeVectorUnique
();
EXPECT_EQ
(
1
,
vresult
.
size
());
EXPECT_EQ
(
1
u
,
vresult
.
size
());
EXPECT_NE
(
nullptr
,
vresult
[
0
]);
EXPECT_EQ
(
7
,
*
vresult
[
0
]);
}
...
...
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