diff options
| author | Copybara-Service <copybara-worker@google.com> | 2022-07-12 14:19:18 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-07-12 14:19:18 (GMT) |
| commit | bea621c3c39d8a7f71f07bd543c3a58bfa684f92 (patch) | |
| tree | 92573263fec03fbc0c2ed13e7e4775491223419c /googletest/src | |
| parent | 78aa2ba4401af0832edcc0d29f229a50ec8b86e5 (diff) | |
| parent | 7107c441885900fedb8458a96bddca16e9768573 (diff) | |
| download | googletest-bea621c3c39d8a7f71f07bd543c3a58bfa684f92.zip googletest-bea621c3c39d8a7f71f07bd543c3a58bfa684f92.tar.gz googletest-bea621c3c39d8a7f71f07bd543c3a58bfa684f92.tar.bz2 | |
Merge pull request #3928 from venik:venik-clean-up
PiperOrigin-RevId: 460455562
Change-Id: I29efc09887651d8734586703fe0691482ba4c981
Diffstat (limited to 'googletest/src')
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 6efd840..a1b2b5d 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -6247,7 +6247,7 @@ void UnitTestImpl::UnshuffleTests() { // GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in // the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't. GTEST_NO_INLINE_ GTEST_NO_TAIL_CALL_ std::string -GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/, int skip_count) { +GetCurrentOsStackTraceExceptTop(int skip_count) { // We pass skip_count + 1 to skip this wrapper function in addition // to what the user really wants to skip. return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1); |