Silence a signedness-comparison warning in gmock-actions_test.
include <functional> when using std::function in gmock.
diff --git a/include/gmock/gmock-generated-function-mockers.h b/include/gmock/gmock-generated-function-mockers.h
index ce7341d..b98b471 100644
--- a/include/gmock/gmock-generated-function-mockers.h
+++ b/include/gmock/gmock-generated-function-mockers.h
@@ -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 {
diff --git a/include/gmock/gmock-generated-function-mockers.h.pump b/include/gmock/gmock-generated-function-mockers.h.pump
index 5928445..b099676 100644
--- a/include/gmock/gmock-generated-function-mockers.h.pump
+++ b/include/gmock/gmock-generated-function-mockers.h.pump
@@ -44,6 +44,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 {
diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc
index ea09bfc..28b48f1 100644
--- a/test/gmock-actions_test.cc
+++ b/test/gmock-actions_test.cc
@@ -1301,7 +1301,7 @@
EXPECT_EQ(19, *result1);
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_EQ(7, *vresult[0]);
@@ -1341,7 +1341,7 @@
EXPECT_NE(result1, result2);
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_EQ(7, *vresult[0]);
}