Skip to content

Commit f12c1ad

Browse files
nodejs-github-bottargos
authored andcommitted
deps: update googletest to eb2d85e
PR-URL: #59335 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
1 parent 6313706 commit f12c1ad

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

deps/googletest/include/gtest/gtest-typed-test.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ template <typename T>
4848
class FooTest : public testing::Test {
4949
public:
5050
...
51-
typedef std::list<T> List;
51+
using List = ::std::list<T>;
5252
static T shared_;
5353
T value_;
5454
};
5555

5656
// Next, associate a list of types with the test suite, which will be
57-
// repeated for each type in the list. The typedef is necessary for
57+
// repeated for each type in the list. The using-declaration is necessary for
5858
// the macro to parse correctly.
59-
typedef testing::Types<char, int, unsigned int> MyTypes;
59+
using MyTypes = ::testing::Types<char, int, unsigned int>;
6060
TYPED_TEST_SUITE(FooTest, MyTypes);
6161

6262
// If the type list contains only one type, you can write that type
@@ -157,7 +157,7 @@ REGISTER_TYPED_TEST_SUITE_P(FooTest,
157157
// argument to the INSTANTIATE_* macro is a prefix that will be added
158158
// to the actual test suite name. Remember to pick unique prefixes for
159159
// different instances.
160-
typedef testing::Types<char, int, unsigned int> MyTypes;
160+
using MyTypes = ::testing::Types<char, int, unsigned int>;
161161
INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
162162

163163
// If the type list contains only one type, you can write that type

deps/googletest/include/gtest/gtest.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1610,6 +1610,8 @@ GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1,
16101610
double val1, double val2,
16111611
double abs_error);
16121612

1613+
using GoogleTest_NotSupported_OnFunctionReturningNonVoid = void;
1614+
16131615
// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
16141616
// A class that enables one to stream messages to assertion macros
16151617
class GTEST_API_ AssertHelper {
@@ -1621,7 +1623,8 @@ class GTEST_API_ AssertHelper {
16211623

16221624
// Message assignment is a semantic trick to enable assertion
16231625
// streaming; see the GTEST_MESSAGE_ macro below.
1624-
void operator=(const Message& message) const;
1626+
GoogleTest_NotSupported_OnFunctionReturningNonVoid operator=(
1627+
const Message& message) const;
16251628

16261629
private:
16271630
// We put our data in a struct so that the size of the AssertHelper class can

0 commit comments

Comments
 (0)