"googlemock/vscode:/vscode.git/clone" did not exist on "67f6188c8fc39439965431100507006bf4a11f71"
Commit 389bad61 authored by kosak's avatar kosak
Browse files

Silence a signedness-comparison warning in gmock-actions_test.

include <functional> when using std::function in gmock.
parent 3d1c78b2
...@@ -43,6 +43,10 @@ ...@@ -43,6 +43,10 @@
#include "gmock/gmock-spec-builders.h" #include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-internal-utils.h" #include "gmock/internal/gmock-internal-utils.h"
#if GTEST_HAS_STD_FUNCTION_
# include <functional>
#endif
namespace testing { namespace testing {
namespace internal { namespace internal {
......
...@@ -44,6 +44,10 @@ $var n = 10 $$ The maximum arity we support. ...@@ -44,6 +44,10 @@ $var n = 10 $$ The maximum arity we support.
#include "gmock/gmock-spec-builders.h" #include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-internal-utils.h" #include "gmock/internal/gmock-internal-utils.h"
#if GTEST_HAS_STD_FUNCTION_
# include <functional>
#endif
namespace testing { namespace testing {
namespace internal { namespace internal {
......
...@@ -1301,7 +1301,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Return) { ...@@ -1301,7 +1301,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Return) {
EXPECT_EQ(19, *result1); EXPECT_EQ(19, *result1);
std::vector<std::unique_ptr<int>> vresult = mock.MakeVectorUnique(); std::vector<std::unique_ptr<int>> vresult = mock.MakeVectorUnique();
EXPECT_EQ(1, vresult.size()); EXPECT_EQ(1u, vresult.size());
EXPECT_NE(nullptr, vresult[0]); EXPECT_NE(nullptr, vresult[0]);
EXPECT_EQ(7, *vresult[0]); EXPECT_EQ(7, *vresult[0]);
...@@ -1341,7 +1341,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Invoke) { ...@@ -1341,7 +1341,7 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue_Invoke) {
EXPECT_NE(result1, result2); EXPECT_NE(result1, result2);
std::vector<std::unique_ptr<int>> vresult = mock.MakeVectorUnique(); std::vector<std::unique_ptr<int>> vresult = mock.MakeVectorUnique();
EXPECT_EQ(1, vresult.size()); EXPECT_EQ(1u, vresult.size());
EXPECT_NE(nullptr, vresult[0]); EXPECT_NE(nullptr, vresult[0]);
EXPECT_EQ(7, *vresult[0]); EXPECT_EQ(7, *vresult[0]);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment