Updates the version number in CMakeLists.txt to 1.12.1 (#3919 )

Due to an oversight version 1.12.0 didn't update the version in CMakeLists.txt. A patch release will fix this issue. I've also added a note to instructions for creating a release to check for this issue.
2022-06-27 13:14:55 -04:00
77 changed files with 514 additions and 1447 deletions
@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+---
+
+**Describe the bug**
+
+Include a clear and concise description of what the problem is, including what
+you expected to happen, and what actually happened.
+
+**Steps to reproduce the bug**
+
+It's important that we are able to reproduce the problem that you are
+experiencing. Please provide all code and relevant steps to reproduce the
+problem, including your `BUILD`/`CMakeLists.txt` file and build commands. Links
+to a GitHub branch or [godbolt.org](https://godbolt.org/) that demonstrate the
+problem are also helpful.
+
+**Does the bug persist in the most recent commit?**
+
+We recommend using the latest commit in the master branch in your projects.
+
+**What operating system and version are you using?**
+
+If you are using a Linux distribution please include the name and version of the
+distribution as well.
+
+**What compiler and version are you using?**
+
+Please include the output of `gcc -v` or `clang -v`, or the equivalent for your
+compiler.
+
+**What build system are you using?**
+
+Please include the output of `bazel --version` or `cmake --version`, or the
+equivalent for your build system.
+
+**Additional context**
+
+Add any other context about the problem here.
@@ -1,53 +0,0 @@
-name: Bug Report
-description: Let us know that something does not work as expected.
-title: "[Bug]: Please title this bug report"
-body:
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Describe the issue
-      description: What happened, and what did you expect to happen?
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce the problem
-      description: It is important that we are able to reproduce the problem that you are experiencing. Please provide all code and relevant steps to reproduce the problem, including your `BUILD`/`CMakeLists.txt` file and build commands. Links to a GitHub branch or [godbolt.org](https://godbolt.org/) that demonstrate the problem are also helpful.
-    validations:
-      required: true
-  - type: textarea
-    id: version
-    attributes:
-      label: What version of GoogleTest are you using?
-      description: Please include the output of `git rev-parse HEAD` or the GoogleTest release version number that you are using.
-    validations:
-      required: true
-  - type: textarea
-    id: os
-    attributes:
-      label: What operating system and version are you using?
-      description: If you are using a Linux distribution please include the name and version of the distribution as well.
-    validations:
-      required: true
-  - type: textarea
-    id: compiler
-    attributes:
-      label: What compiler and version are you using?
-      description: Please include the output of `gcc -v` or `clang -v`, or the equivalent for your compiler.
-    validations:
-      required: true
-  - type: textarea
-    id: buildsystem
-    attributes:
-      label: What build system are you using?
-      description: Please include the output of `bazel --version` or `cmake --version`, or the equivalent for your build system.
-    validations:
-      required: true
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Propose a new feature
+title: ''
+labels: 'enhancement'
+assignees: ''
+---
+
+**Does the feature exist in the most recent commit?**
+
+We recommend using the latest commit from GitHub in your projects.
+
+**Why do we need this feature?**
+
+Ideally, explain why a combination of existing features cannot be used instead.
+
+**Describe the proposal**
+
+Include a detailed description of the feature, with usage examples.
+
+**Is the feature specific to an operating system, compiler, or build system version?**
+
+If it is, please specify which versions.
+
@@ -1,33 +0,0 @@
-name: Feature request
-description: Propose a new feature.
-title: "[FR]: Please title this feature request"
-labels: "enhancement"
-body:
-  - type: textarea
-    id: version
-    attributes:
-      label: Does the feature exist in the most recent commit?
-      description: We recommend using the latest commit from GitHub in your projects.
-    validations:
-      required: true
- - type: textarea
-    id: why
-    attributes:
-      label: Why do we need this feature?
-      description: Ideally, explain why a combination of existing features cannot be used instead.
-    validations:
-      required: true
- - type: textarea
-    id: proposal
-    attributes:
-      label: Describe the proposal.
-      description: Include a detailed description of the feature, with usage examples.
-    validations:
-      required: true
- - type: textarea
-    id: platform
-    attributes:
-      label: Is the feature specific to an operating system, compiler, or build system version?
-      description: If it is, please specify which versions.
-    validations:
-      required: true
@@ -1,5 +1 @@
 blank_issues_enabled: false
-contact_links:
-    - name: Get Help
-      url: https://github.com/google/googletest/discussions
-      about: Please ask and answer questions here.
@@ -4,40 +4,37 @@ on:
  push:
  pull_request:

-env:
-  BAZEL_CXXOPTS: -std=c++14
-
 jobs:
  Linux:
    runs-on: ubuntu-latest
    steps:

-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
      with:
        fetch-depth: 0

    - name: Tests
-      run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ...
+      run: bazel test --test_output=errors //...

-  macOS:
+  MacOs:
    runs-on: macos-latest
    steps:

-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
      with:
        fetch-depth: 0

    - name: Tests
-      run:  bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ...
+      run: bazel test --test_output=errors //...


  Windows:
    runs-on: windows-latest
    steps:

-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
      with:
        fetch-depth: 0

    - name: Tests
-      run: bazel test --cxxopt=/std:c++14 --features=external_include_paths --test_output=errors ...
+      run: bazel test --test_output=errors //...
@@ -7,16 +7,12 @@ if (POLICY CMP0048)
  cmake_policy(SET CMP0048 NEW)
 endif (POLICY CMP0048)

-if (POLICY CMP0069)
-  cmake_policy(SET CMP0069 NEW)
-endif (POLICY CMP0069)
-
 if (POLICY CMP0077)
  cmake_policy(SET CMP0077 NEW)
 endif (POLICY CMP0077)

 project(googletest-distribution)
-set(GOOGLETEST_VERSION 1.13.0)
+set(GOOGLETEST_VERSION 1.12.1)

 if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
  set(CMAKE_CXX_EXTENSIONS OFF)
@@ -30,7 +26,6 @@ include(GNUInstallDirs)
 #Note that googlemock target already builds googletest
 option(BUILD_GMOCK "Builds the googlemock subproject" ON)
 option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
-option(GTEST_HAS_ABSL "Use Abseil and RE2. Requires Abseil and RE2 to be separately added to the build." OFF)

 if(BUILD_GMOCK)
  add_subdirectory( googlemock )
@@ -80,8 +80,8 @@ fairly rigid coding style, as defined by the
 [google-styleguide](https://github.com/google/styleguide) project. All patches
 will be expected to conform to the style outlined
 [here](https://google.github.io/styleguide/cppguide.html). Use
-[.clang-format](https://github.com/google/googletest/blob/main/.clang-format) to
-check your formatting.
+[.clang-format](https://github.com/google/googletest/blob/master/.clang-format)
+to check your formatting.

 ## Requirements for Contributors

@@ -15,14 +15,11 @@ Our documentation is now live on GitHub Pages at
 https://google.github.io/googletest/. We recommend browsing the documentation on
 GitHub Pages rather than directly in the repository.

-#### Release 1.12.1
+#### Release 1.11.0

-[Release 1.12.1](https://github.com/google/googletest/releases/tag/release-1.12.1)
+[Release 1.11.0](https://github.com/google/googletest/releases/tag/release-1.11.0)
 is now available.

-The 1.12.x branch will be the last to support C++11. Future releases will
-require at least C++14.
-
 #### Coming Soon

 *   We are planning to take a dependency on
@@ -59,12 +56,39 @@ More information about building GoogleTest can be found at

 ## Supported Platforms

-GoogleTest follows Google's
-[Foundational C++ Support Policy](https://opensource.google/documentation/policies/cplusplus-support).
-See
-[this table](https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md)
-for a list of currently supported versions compilers, platforms, and build
-tools.
+GoogleTest requires a codebase and compiler compliant with the C++11 standard or
+newer.
+
+The GoogleTest code is officially supported on the following platforms.
+Operating systems or tools not listed below are community-supported. For
+community-supported platforms, patches that do not complicate the code may be
+considered.
+
+If you notice any problems on your platform, please file an issue on the
+[GoogleTest GitHub Issue Tracker](https://github.com/google/googletest/issues).
+Pull requests containing fixes are welcome!
+
+### Operating Systems
+
+*   Linux
+*   macOS
+*   Windows
+
+### Compilers
+
+*   gcc 5.0+
+*   clang 5.0+
+*   MSVC 2015+
+
+**macOS users:** Xcode 9.3+ provides clang 5.0+.
+
+### Build Systems
+
+*   [Bazel](https://bazel.build/)
+*   [CMake](https://cmake.org/)
+
+**Note:** Bazel is the build system used by the team internally and in tests.
+CMake is supported on a best-effort basis and by the community.

 ## Who Is Using GoogleTest?

@@ -111,7 +135,7 @@ that generates stub code for GoogleTest.
 ## Contributing Changes

 Please read
-[`CONTRIBUTING.md`](https://github.com/google/googletest/blob/main/CONTRIBUTING.md)
+[`CONTRIBUTING.md`](https://github.com/google/googletest/blob/master/CONTRIBUTING.md)
 for details on how to contribute to this project.

 Happy testing!
@@ -3,38 +3,37 @@ workspace(name = "com_google_googletest")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

 http_archive(
-    name = "com_google_absl",  # 2023-01-10T21:08:25Z
-    sha256 = "f9a4e749f42c386a32a90fddf0e2913ed408d10c42f7f33ccf4c59ac4f0d1d05",
-    strip_prefix = "abseil-cpp-52835439ca90d86b27bf8cd1708296e95604d724",
-    urls = ["https://github.com/abseil/abseil-cpp/archive/52835439ca90d86b27bf8cd1708296e95604d724.zip"],
+    name = "com_google_absl",
+    sha256 = "1a1745b5ee81392f5ea4371a4ca41e55d446eeaee122903b2eaffbd8a3b67a2b",
+    strip_prefix = "abseil-cpp-01cc6567cff77738e416a7ddc17de2d435a780ce",
+    urls = ["https://github.com/abseil/abseil-cpp/archive/01cc6567cff77738e416a7ddc17de2d435a780ce.zip"],  # 2022-06-21T19:28:27Z
 )

 # Note this must use a commit from the `abseil` branch of the RE2 project.
 # https://github.com/google/re2/tree/abseil
 http_archive(
-    name = "com_googlesource_code_re2",  # 2022-12-21T14:29:10Z
-    sha256 = "b9ce3a51beebb38534d11d40f8928d40509b9e18a735f6a4a97ad3d014c87cb5",
-    strip_prefix = "re2-d0b1f8f2ecc2ea74956c7608b6f915175314ff0e",
-    urls = ["https://github.com/google/re2/archive/d0b1f8f2ecc2ea74956c7608b6f915175314ff0e.zip"],
+    name = "com_googlesource_code_re2",
+    sha256 = "0a890c2aa0bb05b2ce906a15efb520d0f5ad4c7d37b8db959c43772802991887",
+    strip_prefix = "re2-a427f10b9fb4622dd6d8643032600aa1b50fbd12",
+    urls = ["https://github.com/google/re2/archive/a427f10b9fb4622dd6d8643032600aa1b50fbd12.zip"],  # 2022-06-09
 )

 http_archive(
-    name = "rules_python",  # 2023-01-10T22:00:51Z
-    sha256 = "5de54486a60ad8948dabe49605bb1c08053e04001a431ab3e96745b4d97a4419",
-    strip_prefix = "rules_python-70cce26432187a60b4e950118791385e6fb3c26f",
-    urls = ["https://github.com/bazelbuild/rules_python/archive/70cce26432187a60b4e950118791385e6fb3c26f.zip"],
+    name = "rules_python",
+    sha256 = "0b460f17771258341528753b1679335b629d1d25e3af28eda47d009c103a6e15",
+    strip_prefix = "rules_python-aef17ad72919d184e5edb7abf61509eb78e57eda",
+    urls = ["https://github.com/bazelbuild/rules_python/archive/aef17ad72919d184e5edb7abf61509eb78e57eda.zip"],  # 2022-06-21T23:44:47Z
 )

 http_archive(
-    name = "bazel_skylib",  # 2022-11-16T18:29:32Z
-    sha256 = "a22290c26d29d3ecca286466f7f295ac6cbe32c0a9da3a91176a90e0725e3649",
-    strip_prefix = "bazel-skylib-5bfcb1a684550626ce138fe0fe8f5f702b3764c3",
-    urls = ["https://github.com/bazelbuild/bazel-skylib/archive/5bfcb1a684550626ce138fe0fe8f5f702b3764c3.zip"],
+    name = "bazel_skylib",
+    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz"],
+    sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
 )

 http_archive(
-    name = "platforms",  # 2022-11-09T19:18:22Z
-    sha256 = "b4a3b45dc4202e2b3e34e3bc49d2b5b37295fc23ea58d88fb9e01f3642ad9b55",
-    strip_prefix = "platforms-3fbc687756043fb58a407c2ea8c944bc2fe1d922",
-    urls = ["https://github.com/bazelbuild/platforms/archive/3fbc687756043fb58a407c2ea8c944bc2fe1d922.zip"],
+    name = "platforms",
+    sha256 = "a879ea428c6d56ab0ec18224f976515948822451473a80d06c2e50af0bbe5121",
+    strip_prefix = "platforms-da5541f26b7de1dc8e04c075c99df5351742a4a2",
+    urls = ["https://github.com/bazelbuild/platforms/archive/da5541f26b7de1dc8e04c075c99df5351742a4a2.zip"],  # 2022-05-27
 )
@@ -39,7 +39,7 @@ if [[ -z ${GTEST_ROOT:-} ]]; then
 fi

 if [[ -z ${STD:-} ]]; then
-  STD="c++14 c++17 c++20"
+  STD="c++11 c++14 c++17 c++20"
 fi

 # Test the CMake build
@@ -55,7 +55,7 @@ for cc in /usr/local/bin/gcc /opt/llvm/clang/bin/clang; do
      ${LINUX_LATEST_CONTAINER} \
      /bin/bash -c "
        cmake /src \
-          -DCMAKE_CXX_STANDARD=14 \
+          -DCMAKE_CXX_STANDARD=11 \
          -Dgtest_build_samples=ON \
          -Dgtest_build_tests=ON \
          -Dgmock_build_tests=ON \
@@ -72,7 +72,6 @@ time docker run \
  --workdir="/src" \
  --rm \
  --env="CC=/usr/local/bin/gcc" \
-  --env="BAZEL_CXXOPTS=-std=c++14" \
  ${LINUX_GCC_FLOOR_CONTAINER} \
    /usr/local/bin/bazel test ... \
      --copt="-Wall" \
@@ -80,7 +79,6 @@ time docker run \
      --copt="-Wuninitialized" \
      --copt="-Wno-error=pragmas" \
      --distdir="/bazel-distdir" \
-      --features=external_include_paths \
      --keep_going \
      --show_timestamps \
      --test_output=errors
@@ -101,7 +99,6 @@ for std in ${STD}; do
        --copt="-Wuninitialized" \
        --define="absl=${absl}" \
        --distdir="/bazel-distdir" \
-        --features=external_include_paths \
        --keep_going \
        --show_timestamps \
        --test_output=errors
@@ -125,7 +122,6 @@ for std in ${STD}; do
        --copt="-Wuninitialized" \
        --define="absl=${absl}" \
        --distdir="/bazel-distdir" \
-        --features=external_include_paths \
        --keep_going \
        --linkopt="--gcc-toolchain=/usr/local" \
        --show_timestamps \
@@ -40,7 +40,7 @@ for cmake_off_on in OFF ON; do
  BUILD_DIR=$(mktemp -d build_dir.XXXXXXXX)
  cd ${BUILD_DIR}
  time cmake ${GTEST_ROOT} \
-    -DCMAKE_CXX_STANDARD=14 \
+    -DCMAKE_CXX_STANDARD=11 \
    -Dgtest_build_samples=ON \
    -Dgtest_build_tests=ON \
    -Dgmock_build_tests=ON \
@@ -53,7 +53,7 @@ done
 # Test the Bazel build

 # If we are running on Kokoro, check for a versioned Bazel binary.
-KOKORO_GFILE_BAZEL_BIN="bazel-5.1.1-darwin-x86_64"
+KOKORO_GFILE_BAZEL_BIN="bazel-3.7.0-darwin-x86_64"
 if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then
  BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}"
  chmod +x ${BAZEL_BIN}
@@ -66,9 +66,7 @@ for absl in 0 1; do
  ${BAZEL_BIN} test ... \
    --copt="-Wall" \
    --copt="-Werror" \
-    --cxxopt="-std=c++14" \
    --define="absl=${absl}" \
-    --features=external_include_paths \
    --keep_going \
    --show_timestamps \
    --test_output=errors
@@ -1,56 +0,0 @@
-SETLOCAL ENABLEDELAYEDEXPANSION
-
-SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-5.1.1-windows-x86_64.exe
-
-SET PATH=C:\Python37;%PATH%
-SET BAZEL_PYTHON=C:\python37\python.exe
-SET BAZEL_SH=C:\tools\msys64\usr\bin\bash.exe
-SET CMAKE_BIN="C:\Program Files\CMake\bin\cmake.exe"
-SET CTEST_BIN="C:\Program Files\CMake\bin\ctest.exe"
-SET CTEST_OUTPUT_ON_FAILURE=1
-
-IF EXIST git\googletest (
-  CD git\googletest
-) ELSE IF EXIST github\googletest (
-  CD github\googletest
-)
-
-IF %errorlevel% neq 0 EXIT /B 1
-
-:: ----------------------------------------------------------------------------
-:: CMake Visual Studio 15 2017 Win64
-MKDIR cmake_msvc2017
-CD cmake_msvc2017
-
-%CMAKE_BIN% .. ^
-  -G "Visual Studio 15 2017 Win64" ^
-  -DPYTHON_EXECUTABLE:FILEPATH=c:\python37\python.exe ^
-  -DPYTHON_INCLUDE_DIR:PATH=c:\python37\include ^
-  -DPYTHON_LIBRARY:FILEPATH=c:\python37\lib\site-packages\pip ^
-  -Dgtest_build_samples=ON ^
-  -Dgtest_build_tests=ON ^
-  -Dgmock_build_tests=ON
-IF %errorlevel% neq 0 EXIT /B 1
-
-%CMAKE_BIN% --build . --target ALL_BUILD --config Debug -- -maxcpucount
-IF %errorlevel% neq 0 EXIT /B 1
-
-%CTEST_BIN% -C Debug --timeout 600
-IF %errorlevel% neq 0 EXIT /B 1
-
-CD ..
-RMDIR /S /Q cmake_msvc2017
-
-:: ----------------------------------------------------------------------------
-:: Bazel Visual Studio 15 2017 Win64
-
-SET BAZEL_VC=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC
-%BAZEL_EXE% test ... ^
-  --compilation_mode=dbg ^
-  --copt=/std:c++14 ^
-  --copt=/WX ^
-  --features=external_include_paths ^
-  --keep_going ^
-  --test_output=errors ^
-  --test_tag_filters=-no_test_msvc2017
-IF %errorlevel% neq 0 EXIT /B 1
@@ -48,7 +48,7 @@
      <div class="footer">
        GoogleTest &middot;
        <a href="https://github.com/google/googletest">GitHub Repository</a> &middot;
-        <a href="https://github.com/google/googletest/blob/main/LICENSE">License</a> &middot;
+        <a href="https://github.com/google/googletest/blob/master/LICENSE">License</a> &middot;
        <a href="https://policies.google.com/privacy">Privacy Policy</a>
      </div>
    </div>
@@ -487,7 +487,7 @@ When built with Bazel and using Abseil, googletest uses the
 systems (Linux, Cygwin, Mac), googletest uses the
 [POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04)
 syntax. To learn about POSIX syntax, you may want to read this
-[Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_extended).
+[Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).

 On Windows, googletest uses its own simple regular expression implementation. It
 lacks many features. For example, we don't support union (`"x|y"`), grouping
@@ -1095,11 +1095,6 @@ instantiation of the test suite. The next argument is the name of the test
 pattern, and the last is the
 [parameter generator](reference/testing.md#param-generators).

-The parameter generator expression is not evaluated until GoogleTest is
-initialized (via `InitGoogleTest()`). Any prior initialization done in the
-`main` function will be accessible from the parameter generator, for example,
-the results of flag parsing.
-
 You can instantiate a test pattern more than once, so to distinguish different
 instances of the pattern, the instantiation name is added as a prefix to the
 actual test suite name. Remember to pick unique prefixes for different
@@ -1147,8 +1142,8 @@ GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FooTest);

 You can see [sample7_unittest.cc] and [sample8_unittest.cc] for more examples.

-[sample7_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample7_unittest.cc "Parameterized Test example"
-[sample8_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample8_unittest.cc "Parameterized Test example with multiple parameters"
+[sample7_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample7_unittest.cc "Parameterized Test example"
+[sample8_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample8_unittest.cc "Parameterized Test example with multiple parameters"

 ### Creating Value-Parameterized Abstract Tests

@@ -1299,7 +1294,7 @@ TYPED_TEST(FooTest, HasPropertyA) { ... }

 You can see [sample6_unittest.cc] for a complete example.

-[sample6_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample6_unittest.cc "Typed Test example"
+[sample6_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample6_unittest.cc "Typed Test example"

 ## Type-Parameterized Tests

@@ -1738,7 +1733,7 @@ You can do so by adding one line:
 Now, sit back and enjoy a completely different output from your tests. For more
 details, see [sample9_unittest.cc].

-[sample9_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample9_unittest.cc "Event listener example"
+[sample9_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample9_unittest.cc "Event listener example"

 You may append more than one listener to the list. When an `On*Start()` or
 `OnTestPartResult()` event is fired, the listeners will receive it in the order
@@ -1765,7 +1760,7 @@ by the former.

 See [sample10_unittest.cc] for an example of a failure-raising listener.

-[sample10_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample10_unittest.cc "Failure-raising listener example"
+[sample10_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample10_unittest.cc "Failure-raising listener example"

 ## Running Test Programs: Advanced Options

@@ -1913,12 +1908,8 @@ Repeat the tests whose name matches the filter 1000 times.

 If your test program contains
 [global set-up/tear-down](#global-set-up-and-tear-down) code, it will be
-repeated in each iteration as well, as the flakiness may be in it. To avoid
-repeating global set-up/tear-down, specify
-`--gtest_recreate_environments_when_repeating=false`{.nowrap}.
-
-You can also specify the repeat count by setting the `GTEST_REPEAT` environment
-variable.
+repeated in each iteration as well, as the flakiness may be in it. You can also
+specify the repeat count by setting the `GTEST_REPEAT` environment variable.

 ### Shuffling the Tests

@@ -267,7 +267,7 @@ If necessary, you can continue to derive test fixtures from a derived fixture.
 GoogleTest has no limit on how deep the hierarchy can be.

 For a complete example using derived test fixtures, see
-[sample5_unittest.cc](https://github.com/google/googletest/blob/main/googletest/samples/sample5_unittest.cc).
+[sample5_unittest.cc](https://github.com/google/googletest/blob/master/googletest/samples/sample5_unittest.cc).

 ## My compiler complains "void value not ignored as it ought to be." What does this mean?

@@ -140,7 +140,7 @@ To customize the default action for functions with return type `T`, use
  // Sets the default action for return type std::unique_ptr<Buzz> to
  // creating a new Buzz every time.
  DefaultValue<std::unique_ptr<Buzz>>::SetFactory(
-      [] { return std::make_unique<Buzz>(AccessLevel::kInternal); });
+      [] { return MakeUnique<Buzz>(AccessLevel::kInternal); });

  // When this fires, the default action of MakeBuzz() will run, which
  // will return a new Buzz object.
@@ -904,7 +904,7 @@ using ::testing::Contains;
 using ::testing::Property;

 inline constexpr auto HasFoo = [](const auto& f) {
-  return Property("foo", &MyClass::foo, Contains(f));
+  return Property(&MyClass::foo, Contains(f));
 };
 ...
  EXPECT_THAT(x, HasFoo("blah"));
@@ -1158,7 +1158,7 @@ int IsEven(int n) { return (n % 2) == 0 ? 1 : 0; }
 ```

 Note that the predicate function / functor doesn't have to return `bool`. It
-works as long as the return value can be used as the condition in the statement
+works as long as the return value can be used as the condition in in statement
 `if (condition) ...`.

 ### Matching Arguments that Are Not Copyable
@@ -1345,7 +1345,7 @@ class BarPlusBazEqMatcher {

 ...
  Foo foo;
-  EXPECT_THAT(foo, BarPlusBazEq(5))...;
+  EXPECT_CALL(foo, BarPlusBazEq(5))...;
 ```

 ### Matching Containers
@@ -1424,12 +1424,11 @@ Use `Pair` when comparing maps or other associative containers.
 {% raw %}

 ```cpp
-using ::testing::UnorderedElementsAre;
-using ::testing::Pair;
+using testing::ElementsAre;
+using testing::Pair;
 ...
-  absl::flat_hash_map<string, int> m = {{"a", 1}, {"b", 2}, {"c", 3}};
-  EXPECT_THAT(m, UnorderedElementsAre(
-      Pair("a", 1), Pair("b", 2), Pair("c", 3)));
+  std::map<string, int> m = {{"a", 1}, {"b", 2}, {"c", 3}};
+  EXPECT_THAT(m, ElementsAre(Pair("a", 1), Pair("b", 2), Pair("c", 3)));
 ```

 {% endraw %}
@@ -1446,8 +1445,8 @@ using ::testing::Pair;
 *   If the container is passed by pointer instead of by reference, just write
    `Pointee(ElementsAre*(...))`.
 *   The order of elements *matters* for `ElementsAre*()`. If you are using it
-    with containers whose element order are undefined (such as a
-    `std::unordered_map`) you should use `UnorderedElementsAre`.
+    with containers whose element order are undefined (e.g. `hash_map`) you
+    should use `WhenSorted` around `ElementsAre`.

 ### Sharing Matchers

@@ -1904,7 +1903,7 @@ using testing::ReturnPointee;
 ### Combining Actions

 Want to do more than one thing when a function is called? That's fine. `DoAll()`
-allows you to do a sequence of actions every time. Only the return value of the
+allow you to do sequence of actions every time. Only the return value of the
 last action in the sequence will be used.

 ```cpp
@@ -2784,7 +2783,7 @@ If you just need to return a pre-defined move-only value, you can use the
  // When this fires, the unique_ptr<> specified by ByMove(...) will
  // be returned.
  EXPECT_CALL(mock_buzzer_, MakeBuzz("world"))
-      .WillOnce(Return(ByMove(std::make_unique<Buzz>(AccessLevel::kInternal))));
+      .WillOnce(Return(ByMove(MakeUnique<Buzz>(AccessLevel::kInternal))));

  EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("world"));
 ```
@@ -2805,7 +2804,7 @@ pretty much anything you want:
 ```cpp
  EXPECT_CALL(mock_buzzer_, MakeBuzz("x"))
      .WillRepeatedly([](StringPiece text) {
-        return std::make_unique<Buzz>(AccessLevel::kInternal);
+        return MakeUnique<Buzz>(AccessLevel::kInternal);
      });

  EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("x"));
@@ -2824,7 +2823,7 @@ can always use `Return`, or a [lambda or functor](#FunctionsAsActions):
  using ::testing::Unused;

  EXPECT_CALL(mock_buzzer_, ShareBuzz(NotNull(), _)).WillOnce(Return(true));
-  EXPECT_TRUE(mock_buzzer_.ShareBuzz(std::make_unique<Buzz>(AccessLevel::kInternal)),
+  EXPECT_TRUE(mock_buzzer_.ShareBuzz(MakeUnique<Buzz>(AccessLevel::kInternal)),
              0);

  EXPECT_CALL(mock_buzzer_, ShareBuzz(_, _)).WillOnce(
@@ -2868,7 +2867,7 @@ method:
  // When one calls ShareBuzz() on the MockBuzzer like this, the call is
  // forwarded to DoShareBuzz(), which is mocked.  Therefore this statement
  // will trigger the above EXPECT_CALL.
-  mock_buzzer_.ShareBuzz(std::make_unique<Buzz>(AccessLevel::kInternal), 0);
+  mock_buzzer_.ShareBuzz(MakeUnique<Buzz>(AccessLevel::kInternal), 0);
 ```

 ### Making the Compilation Faster
@@ -274,7 +274,6 @@ First, define a fixture class. By convention, you should give it the name
 class QueueTest : public ::testing::Test {
 protected:
  void SetUp() override {
-     // q0_ remains empty
     q1_.Enqueue(1);
     q2_.Enqueue(2);
     q2_.Enqueue(3);
@@ -9,7 +9,7 @@ we recommend this tutorial as a starting point.
 To complete this tutorial, you'll need:

 *   A compatible operating system (e.g. Linux, macOS, Windows).
-*   A compatible C++ compiler that supports at least C++14.
+*   A compatible C++ compiler that supports at least C++11.
 *   [Bazel](https://bazel.build/), the preferred build system used by the
    GoogleTest team.

@@ -17,10 +17,11 @@ See [Supported Platforms](platforms.md) for more information about platforms
 compatible with GoogleTest.

 If you don't already have Bazel installed, see the
-[Bazel installation guide](https://bazel.build/install).
+[Bazel installation guide](https://docs.bazel.build/versions/main/install.html).

-{: .callout .note} Note: The terminal commands in this tutorial show a Unix
-shell prompt, but the commands work on the Windows command line as well.
+{: .callout .note}
+Note: The terminal commands in this tutorial show a Unix shell prompt, but the
+commands work on the Windows command line as well.

 ## Set up a Bazel workspace

@@ -50,16 +51,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

 http_archive(
  name = "com_google_googletest",
-  urls = ["https://github.com/google/googletest/archive/5ab508a01f9eb089207ee87fd547d290da39d015.zip"],
-  strip_prefix = "googletest-5ab508a01f9eb089207ee87fd547d290da39d015",
+  urls = ["https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip"],
+  strip_prefix = "googletest-609281088cfefc76f9d0ce82e1ff6c30cc3591e5",
 )
 ```

 The above configuration declares a dependency on GoogleTest which is downloaded
 as a ZIP archive from GitHub. In the above example,
-`5ab508a01f9eb089207ee87fd547d290da39d015` is the Git commit hash of the
+`609281088cfefc76f9d0ce82e1ff6c30cc3591e5` is the Git commit hash of the
 GoogleTest version to use; we recommend updating the hash often to point to the
-latest version. Use a recent hash on the `main` branch.
+latest version.

 Now you're ready to build C++ code that uses GoogleTest.

@@ -10,7 +10,7 @@ this tutorial as a starting point. If your project uses Bazel, see the
 To complete this tutorial, you'll need:

 *   A compatible operating system (e.g. Linux, macOS, Windows).
-*   A compatible C++ compiler that supports at least C++14.
+*   A compatible C++ compiler that supports at least C++11.
 *   [CMake](https://cmake.org/) and a compatible build tool for building the
    project.
    *   Compatible build tools include
@@ -52,13 +52,13 @@ To do this, in your project directory (`my_project`), create a file named
 cmake_minimum_required(VERSION 3.14)
 project(my_project)

-# GoogleTest requires at least C++14
-set(CMAKE_CXX_STANDARD 14)
+# GoogleTest requires at least C++11
+set(CMAKE_CXX_STANDARD 11)

 include(FetchContent)
 FetchContent_Declare(
  googletest
-  URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+  URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
 )
 # For Windows: Prevent overriding the parent project's compiler/linker settings
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
@@ -66,7 +66,7 @@ FetchContent_MakeAvailable(googletest)
 ```

 The above configuration declares a dependency on GoogleTest which is downloaded
-from GitHub. In the above example, `03597a01ee50ed33e9dfd640b249b4be3799d395` is
+from GitHub. In the above example, `609281088cfefc76f9d0ce82e1ff6c30cc3591e5` is
 the Git commit hash of the GoogleTest version to use; we recommend updating the
 hash often to point to the latest version.

@@ -108,7 +108,7 @@ add_executable(
 )
 target_link_libraries(
  hello_test
-  GTest::gtest_main
+  gtest_main
 )

 include(GoogleTest)
@@ -109,7 +109,7 @@ namespace:
 | `ValuesIn(container)` or `ValuesIn(begin,end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. |
 | `Bool()`                     | Yields sequence `{false, true}`.            |
 | `Combine(g1, g2, ..., gN)`   | Yields as `std::tuple` *n*-tuples all combinations (Cartesian product) of the values generated by the given *n* generators `g1`, `g2`, ..., `gN`. |
-| `ConvertGenerator<T>(g)`     | Yields values generated by generator `g`, `static_cast` to `T`. |
+
 The optional last argument *`name_generator`* is a function or functor that
 generates custom test name suffixes based on the test parameters. The function
 must accept an argument of type
@@ -1,7 +1,7 @@
 # Googletest Samples

 If you're like us, you'd like to look at
-[googletest samples.](https://github.com/google/googletest/blob/main/googletest/samples)
+[googletest samples.](https://github.com/google/googletest/tree/master/googletest/samples)
 The sample directory has a number of well-commented samples showing how to use a
 variety of googletest features.

@@ -122,7 +122,7 @@
 // MORE INFORMATION:
 //
 // To learn more about using these macros, please search for 'ACTION' on
-// https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md
+// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md

 // IWYU pragma: private, include "gmock/gmock.h"
 // IWYU pragma: friend gmock/.*
@@ -1428,10 +1428,8 @@ struct WithArgsAction {
                    // MSVC complains about the I parameter pack not being
                    // expanded (error C3520) despite it being expanded in the
                    // type alias.
-                    // TupleElement is also an MSVC workaround.
-                    // See its definition for details.
-                    OnceAction<R(internal::TupleElement<
-                                 I, std::tuple<Args...>>...)>>::value,
+                    OnceAction<R(typename std::tuple_element<
+                                 I, std::tuple<Args...>>::type...)>>::value,
                int>::type = 0>
  operator OnceAction<R(Args...)>() && {  // NOLINT
    struct OA {
@@ -1455,10 +1453,8 @@ struct WithArgsAction {
                    // MSVC complains about the I parameter pack not being
                    // expanded (error C3520) despite it being expanded in the
                    // type alias.
-                    // TupleElement is also an MSVC workaround.
-                    // See its definition for details.
-                    Action<R(internal::TupleElement<
-                             I, std::tuple<Args...>>...)>>::value,
+                    Action<R(typename std::tuple_element<
+                             I, std::tuple<Args...>>::type...)>>::value,
                int>::type = 0>
  operator Action<R(Args...)>() const {  // NOLINT
    Action<InnerSignature<R, Args...>> converted(inner_action);
@@ -34,8 +34,8 @@
 // IWYU pragma: private, include "gmock/gmock.h"
 // IWYU pragma: friend gmock/.*

-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_
-#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT

 #include <type_traits>  // IWYU pragma: keep
 #include <utility>      // IWYU pragma: keep
@@ -108,11 +108,8 @@ constexpr bool ValidateSpec(const char (&spec)[N]) {
 using internal::FunctionMocker;
 }  // namespace testing

-#define MOCK_METHOD(...)                                               \
-  GMOCK_INTERNAL_WARNING_PUSH()                                        \
-  GMOCK_INTERNAL_WARNING_CLANG(ignored, "-Wunused-member-function")    \
-  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__) \
-  GMOCK_INTERNAL_WARNING_POP()
+#define MOCK_METHOD(...) \
+  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__)

 #define GMOCK_INTERNAL_MOCK_METHOD_ARG_1(...) \
  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
@@ -514,4 +511,4 @@ using internal::FunctionMocker;
 #define GMOCK_MOCKER_(arity, constness, Method) \
  GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)

-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_
@@ -240,7 +240,7 @@
 //
 // To learn more about using these macros, please search for 'MATCHER'
 // on
-// https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md
+// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
 //
 // This file also implements some commonly used argument matchers.  More
 // matchers can be defined by the user implementing the
@@ -258,7 +258,6 @@
 #include <algorithm>
 #include <cmath>
 #include <initializer_list>
-#include <ios>
 #include <iterator>
 #include <limits>
 #include <memory>
@@ -2310,11 +2309,11 @@ class SizeIsMatcher {
        : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}

    void DescribeTo(::std::ostream* os) const override {
-      *os << "has a size that ";
+      *os << "size ";
      size_matcher_.DescribeTo(os);
    }
    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "has a size that ";
+      *os << "size ";
      size_matcher_.DescribeNegationTo(os);
    }

@@ -3236,21 +3235,6 @@ auto UnpackStructImpl(const T& t, MakeIndexSequence<16>, char) {
  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p] = t;
  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p);
 }
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<17>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<18>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<19>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s);
-}
 #endif  // defined(__cpp_structured_bindings)

 template <size_t I, typename T>
@@ -3317,8 +3301,8 @@ class FieldsAreMatcherImpl<Struct, IndexSequence<I...>>
    std::vector<StringMatchResultListener> inner_listener(sizeof...(I));

    VariadicExpand(
-        {failed_pos == ~size_t{}&& !std::get<I>(matchers_).MatchAndExplain(
-                           std::get<I>(tuple), &inner_listener[I])
+        {failed_pos == ~size_t{} && !std::get<I>(matchers_).MatchAndExplain(
+                                        std::get<I>(tuple), &inner_listener[I])
             ? failed_pos = I
             : 0 ...});
    if (failed_pos != ~size_t{}) {
@@ -3645,6 +3629,23 @@ class UnorderedElementsAreMatcherImpl
        AnalyzeElements(stl_container.begin(), stl_container.end(),
                        &element_printouts, listener);

+    if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) {
+      return true;
+    }
+
+    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
+      if (matrix.LhsSize() != matrix.RhsSize()) {
+        // The element count doesn't match.  If the container is empty,
+        // there's no need to explain anything as Google Mock already
+        // prints the empty container. Otherwise we just need to show
+        // how many elements there actually are.
+        if (matrix.LhsSize() != 0 && listener->IsInterested()) {
+          *listener << "which has " << Elements(matrix.LhsSize());
+        }
+        return false;
+      }
+    }
+
    return VerifyMatchMatrix(element_printouts, matrix, listener) &&
           FindPairing(matrix, listener);
  }
@@ -4099,12 +4100,7 @@ class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> {
    const char* sep = "";
    // Workaround spurious C4189 on MSVC<=15.7 when k is empty.
    (void)sep;
-    // The static_cast to void is needed to silence Clang's -Wcomma warning.
-    // This pattern looks suspiciously like we may have mismatched parentheses
-    // and may have been trying to use the first operation of the comma operator
-    // as a member of the array, so Clang warns that we may have made a mistake.
-    const char* dummy[] = {
-        "", (static_cast<void>(*os << sep << "#" << k), sep = ", ")...};
+    const char* dummy[] = {"", (*os << sep << "#" << k, sep = ", ")...};
    (void)dummy;
    *os << ") ";
  }
@@ -5471,13 +5467,7 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
      }                                                                        \
    };                                                                         \
  };                                                                           \
-  inline name##Matcher GMOCK_INTERNAL_WARNING_PUSH()                           \
-      GMOCK_INTERNAL_WARNING_CLANG(ignored, "-Wunused-function")               \
-          GMOCK_INTERNAL_WARNING_CLANG(ignored, "-Wunused-member-function")    \
-              name                                                             \
-              GMOCK_INTERNAL_WARNING_POP()() {                                 \
-    return {};                                                                 \
-  }                                                                            \
+  GTEST_ATTRIBUTE_UNUSED_ inline name##Matcher name() { return {}; }           \
  template <typename arg_type>                                                 \
  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(                   \
      const arg_type& arg,                                                     \
@@ -40,9 +40,6 @@
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_

-#include <ostream>
-#include <string>
-
 #include "gmock/gmock-matchers.h"

 namespace testing {
@@ -59,42 +56,14 @@ namespace testing {
 #endif
 #endif

-namespace internal {
-
-// Implements the polymorphic IsEmpty matcher, which
-// can be used as a Matcher<T> as long as T is either a container that defines
-// empty() and size() (e.g. std::vector or std::string), or a C-style string.
-class IsEmptyMatcher {
- public:
-  // Matches anything that defines empty() and size().
-  template <typename MatcheeContainerType>
-  bool MatchAndExplain(const MatcheeContainerType& c,
-                       MatchResultListener* listener) const {
-    if (c.empty()) {
-      return true;
-    }
-    *listener << "whose size is " << c.size();
-    return false;
+// Defines a matcher that matches an empty container. The container must
+// support both size() and empty(), which all STL-like containers provide.
+MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
+  if (arg.empty()) {
+    return true;
  }
-
-  // Matches C-style strings.
-  bool MatchAndExplain(const char* s, MatchResultListener* listener) const {
-    return MatchAndExplain(std::string(s), listener);
-  }
-
-  // Describes what this matcher matches.
-  void DescribeTo(std::ostream* os) const { *os << "is empty"; }
-
-  void DescribeNegationTo(std::ostream* os) const { *os << "isn't empty"; }
-};
-
-}  // namespace internal
-
-// Creates a polymorphic matcher that matches an empty container or C-style
-// string. The container must support both size() and empty(), which all
-// STL-like containers provide.
-inline PolymorphicMatcher<internal::IsEmptyMatcher> IsEmpty() {
-  return MakePolymorphicMatcher(internal::IsEmptyMatcher());
+  *result_listener << "whose size is " << arg.size();
+  return false;
 }

 // Define a matcher that matches a value that evaluates in boolean
@@ -65,7 +65,6 @@
 #include <functional>
 #include <map>
 #include <memory>
-#include <ostream>
 #include <set>
 #include <sstream>
 #include <string>
@@ -657,7 +656,7 @@ class GTEST_API_ InSequence {

  InSequence(const InSequence&) = delete;
  InSequence& operator=(const InSequence&) = delete;
-};
+} GTEST_ATTRIBUTE_UNUSED_;

 namespace internal {

@@ -707,12 +706,6 @@ class GTEST_API_ ExpectationBase {
  // describes it to the ostream.
  virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) = 0;

-  // Do not rely on this for correctness.
-  // This is only for making human-readable test output easier to understand.
-  void UntypedDescription(std::string description) {
-    description_ = std::move(description);
-  }
-
 protected:
  friend class ::testing::Expectation;
  friend class UntypedFunctionMockerBase;
@@ -779,10 +772,6 @@ class GTEST_API_ ExpectationBase {
    retired_ = true;
  }

-  // Returns a human-readable description of this expectation.
-  // Do not rely on this for correctness. It is only for human readability.
-  const std::string& GetDescription() const { return description_; }
-
  // Returns true if and only if this expectation is satisfied.
  bool IsSatisfied() const GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
    g_gmock_mutex.AssertHeld();
@@ -842,7 +831,6 @@ class GTEST_API_ ExpectationBase {
  const char* file_;               // The file that contains the expectation.
  int line_;                       // The line number of the expectation.
  const std::string source_text_;  // The EXPECT_CALL(...) source text.
-  std::string description_;        // User-readable name for the expectation.
  // True if and only if the cardinality is specified explicitly.
  bool cardinality_specified_;
  Cardinality cardinality_;  // The cardinality of the expectation.
@@ -921,13 +909,6 @@ class TypedExpectation<R(Args...)> : public ExpectationBase {
    return *this;
  }

-  // Do not rely on this for correctness.
-  // This is only for making human-readable test output easier to understand.
-  TypedExpectation& Description(std::string name) {
-    ExpectationBase::UntypedDescription(std::move(name));
-    return *this;
-  }
-
  // Implements the .Times() clause.
  TypedExpectation& Times(const Cardinality& a_cardinality) {
    ExpectationBase::UntypedTimes(a_cardinality);
@@ -1218,15 +1199,10 @@ class TypedExpectation<R(Args...)> : public ExpectationBase {
                                         ::std::ostream* why)
      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
    g_gmock_mutex.AssertHeld();
-    const ::std::string& expectation_description = GetDescription();
    if (IsSaturated()) {
      // We have an excessive call.
      IncrementCallCount();
-      *what << "Mock function ";
-      if (!expectation_description.empty()) {
-        *what << "\"" << expectation_description << "\" ";
-      }
-      *what << "called more times than expected - ";
+      *what << "Mock function called more times than expected - ";
      mocker->DescribeDefaultActionTo(args, what);
      DescribeCallCountTo(why);

@@ -1241,11 +1217,7 @@ class TypedExpectation<R(Args...)> : public ExpectationBase {
    }

    // Must be done after IncrementCount()!
-    *what << "Mock function ";
-    if (!expectation_description.empty()) {
-      *what << "\"" << expectation_description << "\" ";
-    }
-    *what << "call matches " << source_text() << "...\n";
+    *what << "Mock function call matches " << source_text() << "...\n";
    return &(GetCurrentAction(mocker, args));
  }

@@ -95,24 +95,6 @@ inline Element* GetRawPointer(Element* p) {
  return p;
 }

-// Default definitions for all compilers.
-// NOTE: If you implement support for other compilers, make sure to avoid
-// unexpected overlaps.
-// (e.g., Clang also processes #pragma GCC, and clang-cl also handles _MSC_VER.)
-#define GMOCK_INTERNAL_WARNING_PUSH()
-#define GMOCK_INTERNAL_WARNING_CLANG(Level, Name)
-#define GMOCK_INTERNAL_WARNING_POP()
-
-#if defined(__clang__)
-#undef GMOCK_INTERNAL_WARNING_PUSH
-#define GMOCK_INTERNAL_WARNING_PUSH() _Pragma("clang diagnostic push")
-#undef GMOCK_INTERNAL_WARNING_CLANG
-#define GMOCK_INTERNAL_WARNING_CLANG(Level, Warning) \
-  _Pragma(GMOCK_PP_INTERNAL_STRINGIZE(clang diagnostic Level Warning))
-#undef GMOCK_INTERNAL_WARNING_POP
-#define GMOCK_INTERNAL_WARNING_POP() _Pragma("clang diagnostic pop")
-#endif
-
 // MSVC treats wchar_t as a native type usually, but treats it as the
 // same as unsigned short when the compiler option /Zc:wchar_t- is
 // specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t
@@ -308,6 +290,13 @@ class WithoutMatchers {
 // Internal use only: access the singleton instance of WithoutMatchers.
 GTEST_API_ WithoutMatchers GetWithoutMatchers();

+// Disable MSVC warnings for infinite recursion, since in this case the
+// recursion is unreachable.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4717)
+#endif
+
 // Invalid<T>() is usable as an expression of type T, but will terminate
 // the program with an assertion failure if actually run.  This is useful
 // when a value of type T is needed for compilation, but the statement
@@ -325,6 +314,10 @@ inline T Invalid() {
 #endif
 }

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 // Given a raw type (i.e. having no top-level reference or const
 // modifier) RawContainer that's either an STL-style container or a
 // native array, class StlContainerView<RawContainer> has the
@@ -471,13 +464,6 @@ struct Function<R(Args...)> {
 template <typename R, typename... Args>
 constexpr size_t Function<R(Args...)>::ArgumentCount;

-// Workaround for MSVC error C2039: 'type': is not a member of 'std'
-// when std::tuple_element is used.
-// See: https://github.com/google/googletest/issues/3931
-// Can be replaced with std::tuple_element_t in C++14.
-template <size_t I, typename T>
-using TupleElement = typename std::tuple_element<I, T>::type;
-
 bool Base64Unescape(const std::string& encoded, std::string* decoded);

 #ifdef _MSC_VER
@@ -181,7 +181,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message,
    }
    std::cout << "Stack trace:\n"
              << ::testing::internal::GetCurrentOsStackTraceExceptTop(
-                     actual_to_skip);
+                     ::testing::UnitTest::GetInstance(), actual_to_skip);
  }
  std::cout << ::std::flush;
 }
@@ -199,10 +199,9 @@ GTEST_API_ void IllegalDoDefault(const char* file, int line) {
 }

 constexpr char UnBase64Impl(char c, const char* const base64, char carry) {
-  return *base64 == 0 ? static_cast<char>(65)
-         : *base64 == c
-             ? carry
-             : UnBase64Impl(c, base64 + 1, static_cast<char>(carry + 1));
+  return *base64 == 0   ? static_cast<char>(65)
+         : *base64 == c ? carry
+                        : UnBase64Impl(c, base64 + 1, carry + 1);
 }

 template <size_t... I>
@@ -370,23 +370,6 @@ void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(
 bool UnorderedElementsAreMatcherImplBase::VerifyMatchMatrix(
    const ::std::vector<std::string>& element_printouts,
    const MatchMatrix& matrix, MatchResultListener* listener) const {
-  if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) {
-    return true;
-  }
-
-  if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-    if (matrix.LhsSize() != matrix.RhsSize()) {
-      // The element count doesn't match.  If the container is empty,
-      // there's no need to explain anything as Google Mock already
-      // prints the empty container. Otherwise we just need to show
-      // how many elements there actually are.
-      if (matrix.LhsSize() != 0 && listener->IsInterested()) {
-        *listener << "which has " << Elements(matrix.LhsSize());
-      }
-      return false;
-    }
-  }
-
  bool result = true;
  ::std::vector<char> element_matched(matrix.LhsSize(), 0);
  ::std::vector<char> matcher_matched(matrix.RhsSize(), 0);
@@ -51,9 +51,6 @@
 #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
 #include <unistd.h>  // NOLINT
 #endif
-#if GTEST_OS_QURT
-#include <qurt_event.h>
-#endif

 // Silence C4800 (C4800: 'int *const ': forcing value
 // to bool 'true' or 'false') for MSVC 15
@@ -298,7 +295,7 @@ void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
              "call should not happen.  Do not suppress it by blindly adding "
              "an EXPECT_CALL() if you don't mean to enforce the call.  "
              "See "
-              "https://github.com/google/googletest/blob/main/docs/"
+              "https://github.com/google/googletest/blob/master/docs/"
              "gmock_cook_book.md#"
              "knowing-when-to-expect for details.\n",
          stack_frames_to_skip);
@@ -409,15 +406,8 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
    } else if (!untyped_expectation->IsSatisfied()) {
      expectations_met = false;
      ::std::stringstream ss;
-
-      const ::std::string& expectation_name =
-          untyped_expectation->GetDescription();
-      ss << "Actual function ";
-      if (!expectation_name.empty()) {
-        ss << "\"" << expectation_name << "\" ";
-      }
-      ss << "call count doesn't match " << untyped_expectation->source_text()
-         << "...\n";
+      ss << "Actual function call count doesn't match "
+         << untyped_expectation->source_text() << "...\n";
      // No need to show the source file location of the expectation
      // in the description, as the Expect() call that follows already
      // takes care of it.
@@ -445,7 +435,7 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
  return expectations_met;
 }

-static CallReaction intToCallReaction(int mock_behavior) {
+CallReaction intToCallReaction(int mock_behavior) {
  if (mock_behavior >= kAllow && mock_behavior <= kFail) {
    return static_cast<internal::CallReaction>(mock_behavior);
  }
@@ -529,12 +519,8 @@ class MockObjectRegistry {
      // RUN_ALL_TESTS() has already returned when this destructor is
      // called.  Therefore we cannot use the normal Google Test
      // failure reporting mechanism.
-#if GTEST_OS_QURT
-      qurt_exception_raise_fatal();
-#else
      _exit(1);  // We cannot call exit() as it is not reentrant and
                 // may already have been called.
-#endif
    }
  }

@@ -466,7 +466,7 @@ TEST(DefaultValueOfReferenceTest, IsInitiallyUnset) {
  EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::IsSet());
 }

-// Tests that DefaultValue<T&>::Exists is false initially.
+// Tests that DefaultValue<T&>::Exists is false initiallly.
 TEST(DefaultValueOfReferenceTest, IsInitiallyNotExisting) {
  EXPECT_FALSE(DefaultValue<int&>::Exists());
  EXPECT_FALSE(DefaultValue<MyDefaultConstructible&>::Exists());
@@ -684,7 +684,7 @@ TEST(ReturnTest, SupportsReferenceLikeReturnType) {
  // A reference wrapper for std::vector<int>, implicitly convertible from it.
  struct Result {
    const std::vector<int>* v;
-    Result(const std::vector<int>& vec) : v(&vec) {}  // NOLINT
+    Result(const std::vector<int>& v) : v(&v) {}  // NOLINT
  };

  // Set up an action for a mock function that returns the reference wrapper
@@ -717,7 +717,7 @@ TEST(ReturnTest, PrefersConversionOperator) {
  struct Out {
    int x;

-    explicit Out(const int val) : x(val) {}
+    explicit Out(const int x) : x(x) {}
    explicit Out(const In&) : x(0) {}
  };

@@ -807,7 +807,7 @@ TEST(ReturnTest, MoveOnlyResultType) {
                "");
 }

-// Tests that Return(v) is covariant.
+// Tests that Return(v) is covaraint.

 struct Base {
  bool operator==(const Base&) { return true; }
@@ -958,21 +958,6 @@ TEST(MockMethodMockFunctionTest, MockMethodSizeOverhead) {
  EXPECT_EQ(sizeof(LegacyMockMethodSizes0), sizeof(MockMethodSizes0));
 }

-TEST(MockMethodMockFunctionTest, EnsureNoUnusedMemberFunction) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic error "-Wunused-member-function"
-#endif
-  // https://github.com/google/googletest/issues/4052
-  struct Foo {
-    MOCK_METHOD(void, foo, ());
-  };
-  EXPECT_CALL(Foo(), foo()).Times(0);
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-}
-
 void hasTwoParams(int, int);
 void MaybeThrows();
 void DoesntThrow() noexcept;
@@ -39,8 +39,6 @@
 #pragma warning(disable : 4100)
 #endif

-#include <vector>
-
 #include "test/gmock-matchers_test.h"

 namespace testing {
@@ -985,30 +983,6 @@ TEST(ComparisonBaseTest, WorksWithMoveOnly) {
  helper.Call(MoveOnly(1));
 }

-TEST(IsEmptyTest, MatchesContainer) {
-  const Matcher<std::vector<int>> m = IsEmpty();
-  std::vector<int> a = {};
-  std::vector<int> b = {1};
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_FALSE(m.Matches(b));
-}
-
-TEST(IsEmptyTest, MatchesStdString) {
-  const Matcher<std::string> m = IsEmpty();
-  std::string a = "z";
-  std::string b = "";
-  EXPECT_FALSE(m.Matches(a));
-  EXPECT_TRUE(m.Matches(b));
-}
-
-TEST(IsEmptyTest, MatchesCString) {
-  const Matcher<const char*> m = IsEmpty();
-  const char a[] = "";
-  const char b[] = "x";
-  EXPECT_TRUE(m.Matches(a));
-  EXPECT_FALSE(m.Matches(b));
-}
-
 // Tests that IsNull() matches any NULL pointer of any type.
 TEST(IsNullTest, MatchesNullPointer) {
  Matcher<int*> m1 = IsNull();
@@ -1710,21 +1684,6 @@ TEST(FieldsAreTest, StructuredBindings) {
  };
  EXPECT_THAT(MyVarType16{},
              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType17 {
-    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q;
-  };
-  EXPECT_THAT(MyVarType17{},
-              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType18 {
-    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r;
-  };
-  EXPECT_THAT(MyVarType18{},
-              FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-  struct MyVarType19 {
-    int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s;
-  };
-  EXPECT_THAT(MyVarType19{}, FieldsAre(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                                       0, 0, 0, 0, 0));
 }
 #endif

@@ -1182,8 +1182,8 @@ TEST(SizeIsTest, WorksWithMinimalistCustomType) {

 TEST(SizeIsTest, CanDescribeSelf) {
  Matcher<vector<int>> m = SizeIs(2);
-  EXPECT_EQ("has a size that is equal to 2", Describe(m));
-  EXPECT_EQ("has a size that isn't equal to 2", DescribeNegation(m));
+  EXPECT_EQ("size is equal to 2", Describe(m));
+  EXPECT_EQ("size isn't equal to 2", DescribeNegation(m));
 }

 TEST(SizeIsTest, ExplainsResult) {
@@ -1561,7 +1561,7 @@ TEST(AnyOfArrayTest, Matchers) {
 }

 TEST_P(AnyOfArrayTestP, ExplainsMatchResultCorrectly) {
-  // AnyOfArray and AllOfArray use the same underlying template-template,
+  // AnyOfArray and AllOfArry use the same underlying template-template,
  // thus it is sufficient to test one here.
  const std::vector<int> v0{};
  const std::vector<int> v1{1};
@@ -1615,20 +1615,6 @@ TEST(MatcherPMacroTest, WorksOnMoveOnlyType) {
  EXPECT_THAT(p, Not(UniquePointee(2)));
 }

-MATCHER(EnsureNoUnusedButMarkedUnusedWarning, "") { return (arg % 2) == 0; }
-
-TEST(MockMethodMockFunctionTest, EnsureNoUnusedButMarkedUnusedWarning) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic error "-Wused-but-marked-unused"
-#endif
-  // https://github.com/google/googletest/issues/4055
-  EXPECT_THAT(0, EnsureNoUnusedButMarkedUnusedWarning());
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-}
-
 #if GTEST_HAS_EXCEPTIONS

 // std::function<void()> is used below for compatibility with older copies of
@@ -739,12 +739,11 @@ TEST(ExpectCallTest, CatchesTooFewCalls) {
  EXPECT_NONFATAL_FAILURE(
      {  // NOLINT
        MockB b;
-        EXPECT_CALL(b, DoB(5)).Description("DoB Method").Times(AtLeast(2));
+        EXPECT_CALL(b, DoB(5)).Times(AtLeast(2));

        b.DoB(5);
      },
-      "Actual function \"DoB Method\" call count "
-      "doesn't match EXPECT_CALL(b, DoB(5))...\n"
+      "Actual function call count doesn't match EXPECT_CALL(b, DoB(5))...\n"
      "         Expected: to be called at least twice\n"
      "           Actual: called once - unsatisfied and active");
 }
@@ -1065,7 +1064,7 @@ TEST(UnexpectedCallTest, UnmatchedArguments) {

 // Tests that Google Mock explains that an expectation with
 // unsatisfied pre-requisites doesn't match the call.
-TEST(UnexpectedCallTest, UnsatisfiedPrerequisites) {
+TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) {
  Sequence s1, s2;
  MockB b;
  EXPECT_CALL(b, DoB(1)).InSequence(s1);
@@ -1149,11 +1148,10 @@ TEST(ExcessiveCallTest, DoesDefaultAction) {
  // When there is no ON_CALL(), the default value for the return type
  // should be returned.
  MockB b;
-  EXPECT_CALL(b, DoB(0)).Description("DoB Method").Times(0);
+  EXPECT_CALL(b, DoB(0)).Times(0);
  int n = -1;
-  EXPECT_NONFATAL_FAILURE(
-      n = b.DoB(0),
-      "Mock function \"DoB Method\" called more times than expected");
+  EXPECT_NONFATAL_FAILURE(n = b.DoB(0),
+                          "Mock function called more times than expected");
  EXPECT_EQ(0, n);
 }

@@ -1161,11 +1159,10 @@ TEST(ExcessiveCallTest, DoesDefaultAction) {
 // the failure message contains the argument values.
 TEST(ExcessiveCallTest, GeneratesFailureForVoidFunction) {
  MockA a;
-  EXPECT_CALL(a, DoA(_)).Description("DoA Method").Times(0);
+  EXPECT_CALL(a, DoA(_)).Times(0);
  EXPECT_NONFATAL_FAILURE(
      a.DoA(9),
-      "Mock function \"DoA Method\" called more times than expected - "
-      "returning directly.\n"
+      "Mock function called more times than expected - returning directly.\n"
      "    Function call: DoA(9)\n"
      "         Expected: to be never called\n"
      "           Actual: called once - over-saturated and active");
@@ -2062,7 +2059,7 @@ class GMockVerboseFlagTest : public VerboseFlagPreservingFixture {
        "call should not happen.  Do not suppress it by blindly adding "
        "an EXPECT_CALL() if you don't mean to enforce the call.  "
        "See "
-        "https://github.com/google/googletest/blob/main/docs/"
+        "https://github.com/google/googletest/blob/master/docs/"
        "gmock_cook_book.md#"
        "knowing-when-to-expect for details.";

@@ -159,9 +159,6 @@ class GMockOutputTest(gmock_test_utils.TestCase):
    golden_file = open(GOLDEN_PATH, 'rb')
    golden = golden_file.read().decode('utf-8')
    golden_file.close()
-    # On Windows the repository might have been checked out with \r\n line
-    # endings, so normalize it here.
-    golden = ToUnixLineEnding(golden)

    # The normalized output should match the golden file.
    self.assertEqual(golden, output)
@@ -75,14 +75,14 @@ GMOCK WARNING:
 Uninteresting mock function call - returning default value.
    Function call: Bar2(0, 1)
          Returns: false
-NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
 [       OK ] GMockOutputTest.UninterestingCall
 [ RUN      ] GMockOutputTest.UninterestingCallToVoidFunction

 GMOCK WARNING:
 Uninteresting mock function call - returning directly.
    Function call: Bar3(0, 1)
-NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
 [       OK ] GMockOutputTest.UninterestingCallToVoidFunction
 [ RUN      ] GMockOutputTest.RetiredExpectation
 unknown file: Failure
@@ -266,14 +266,14 @@ Uninteresting mock function call - taking default action specified at:
 FILE:#:
    Function call: Bar2(2, 2)
          Returns: true
-NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.

 GMOCK WARNING:
 Uninteresting mock function call - taking default action specified at:
 FILE:#:
    Function call: Bar2(1, 1)
          Returns: false
-NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/main/docs/gmock_cook_book.md#knowing-when-to-expect for details.
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md#knowing-when-to-expect for details.
 [       OK ] GMockOutputTest.UninterestingCallWithDefaultAction
 [ RUN      ] GMockOutputTest.ExplicitActionsRunOutWithDefaultAction

@@ -125,22 +125,6 @@ include_directories(${gtest_build_include_dirs})
 # aggressive about warnings.
 cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
 set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
-if(GTEST_HAS_ABSL)
-  target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
-  target_link_libraries(gtest PUBLIC
-    absl::failure_signal_handler
-    absl::stacktrace
-    absl::symbolize
-    absl::flags_parse
-    absl::flags_reflection
-    absl::flags_usage
-    absl::strings
-    absl::any
-    absl::optional
-    absl::variant
-    re2::re2
-  )
-endif()
 cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
 set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
 # If the CMake version supports it, attach header directory information
@@ -9,7 +9,7 @@ depends on which build system you use, and is usually straightforward.
 ### Build with CMake

 GoogleTest comes with a CMake build script
-([CMakeLists.txt](https://github.com/google/googletest/blob/main/CMakeLists.txt))
+([CMakeLists.txt](https://github.com/google/googletest/blob/master/CMakeLists.txt))
 that can be used on a wide range of platforms ("C" stands for cross-platform.).
 If you don't have CMake installed already, you can download it for free from
 <http://www.cmake.org/>.
@@ -25,7 +25,7 @@ When building GoogleTest as a standalone project, the typical workflow starts
 with

 ```
-git clone https://github.com/google/googletest.git -b release-1.12.1
+git clone https://github.com/google/googletest.git -b release-1.11.0
 cd googletest        # Main directory of the cloned repository.
 mkdir build          # Create a directory to hold the build output.
 cd build
@@ -94,7 +94,7 @@ include(FetchContent)
 FetchContent_Declare(
  googletest
  # Specify the commit you depend on and update it regularly.
-  URL https://github.com/google/googletest/archive/5376968f6948923e2411081fd9372e71a59d8e77.zip
+  URL https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.zip
 )
 # For Windows: Prevent overriding the parent project's compiler/linker settings
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
@@ -140,7 +140,7 @@ command line. Generally, these macros are named like `GTEST_XYZ` and you define
 them to either 1 or 0 to enable or disable a certain feature.

 We list the most frequently used macros below. For a complete list, see file
-[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/main/googletest/include/gtest/internal/gtest-port.h).
+[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/googletest/include/gtest/internal/gtest-port.h).

 ### Multi-threaded Tests

@@ -186,9 +186,9 @@ to the compiler flags.
 Note: while the above steps aren't technically necessary today when using some
 compilers (e.g. GCC), they may become necessary in the future, if we decide to
 improve the speed of loading the library (see
-<https://gcc.gnu.org/wiki/Visibility> for details). Therefore you are
-recommended to always add the above flags when using GoogleTest as a shared
-library. Otherwise a future release of GoogleTest may break your build script.
+<http://gcc.gnu.org/wiki/Visibility> for details). Therefore you are recommended
+to always add the above flags when using GoogleTest as a shared library.
+Otherwise a future release of GoogleTest may break your build script.

 ### Avoiding Macro Name Clashes

@@ -21,9 +21,8 @@ endif (POLICY CMP0054)
 # This must be a macro(), as inside a function string() can only
 # update variables in the function scope.
 macro(fix_default_compiler_settings_)
-  if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC|Clang")
-    # For MSVC and Clang, CMake sets certain flags to defaults we want to
-    # override.
+  if (MSVC)
+    # For MSVC, CMake sets certain flags to defaults we want to override.
    # This replacement code is taken from sample in the CMake Wiki at
    # https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace.
    foreach (flag_var
@@ -40,10 +39,6 @@ macro(fix_default_compiler_settings_)
        # on CRT DLLs being available. CMake always defaults to using shared
        # CRT libraries, so we override that default here.
        string(REPLACE "/MD" "-MT" ${flag_var} "${${flag_var}}")
-
-        # When using Ninja with Clang, static builds pass -D_DLL on Windows.
-        # This is incorrect and should not happen, so we fix that here.
-        string(REPLACE "-D_DLL" "" ${flag_var} "${${flag_var}}")
      endif()

      # We prefer more strict warning checking for building Google Test.
@@ -87,9 +82,7 @@ macro(config_compiler_and_linker)
    # http://stackoverflow.com/questions/3232669 explains the issue.
    set(cxx_base_flags "${cxx_base_flags} -wd4702")
    # Ensure MSVC treats source files as UTF-8 encoded.
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-      set(cxx_base_flags "${cxx_base_flags} -utf-8")
-    endif()
+    set(cxx_base_flags "${cxx_base_flags} -utf-8")
  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
    set(cxx_base_flags "-Wall -Wshadow -Wconversion")
    set(cxx_exception_flags "-fexceptions")
@@ -167,8 +160,7 @@ function(cxx_library_with_type name type cxx_flags)
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-    COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+    PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
  # make PDBs match library name
  get_target_property(pdb_debug_postfix ${name} DEBUG_POSTFIX)
  set_target_properties(${name}
@@ -197,7 +189,7 @@ function(cxx_library_with_type name type cxx_flags)
  endif()

  if (NOT "${CMAKE_VERSION}" VERSION_LESS "3.8")
-    target_compile_features(${name} PUBLIC cxx_std_14)
+    target_compile_features(${name} PUBLIC cxx_std_11)
  endif()
 endfunction()

@@ -250,12 +242,6 @@ function(cxx_executable name dir libs)
    ${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN})
 endfunction()

-# CMP0094 policy enables finding a Python executable in the LOCATION order, as
-# specified by the PATH environment variable.
-if (POLICY CMP0094)
-  cmake_policy(SET CMP0094 NEW)
-endif()
-
 # Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
 if ("${CMAKE_VERSION}" VERSION_LESS "3.12.0")
  find_package(PythonInterp)
@@ -842,7 +842,7 @@ class MatchesRegexMatcher {
  template <class MatcheeStringType>
  bool MatchAndExplain(const MatcheeStringType& s,
                       MatchResultListener* /* listener */) const {
-    const std::string s2(s);
+    const std::string& s2(s);
    return full_match_ ? RE::FullMatch(s2, *regex_)
                       : RE::PartialMatch(s2, *regex_);
  }
@@ -50,9 +50,7 @@

 #include <limits>
 #include <memory>
-#include <ostream>
 #include <sstream>
-#include <string>

 #include "gtest/internal/gtest-port.h"

@@ -407,49 +407,9 @@ internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
  return internal::CartesianProductHolder<Generator...>(g...);
 }

-// ConvertGenerator() wraps a parameter generator in order to cast each produced
-// value through a known type before supplying it to the test suite
-//
-// Synopsis:
-// ConvertGenerator<T>(gen)
-//   - returns a generator producing the same elements as generated by gen, but
-//     each element is static_cast to type T before being returned
-//
-// It is useful when using the Combine() function to get the generated
-// parameters in a custom type instead of std::tuple
-//
-// Example:
-//
-// This will instantiate tests in test suite AnimalTest each one with
-// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
-// tuple("dog", BLACK), and tuple("dog", WHITE):
-//
-// enum Color { BLACK, GRAY, WHITE };
-// struct ParamType {
-//   using TupleT = std::tuple<const char*, Color>;
-//   std::string animal;
-//   Color color;
-//   ParamType(TupleT t) : animal(std::get<0>(t)), color(std::get<1>(t)) {}
-// };
-// class AnimalTest
-//     : public testing::TestWithParam<ParamType> {...};
-//
-// TEST_P(AnimalTest, AnimalLooksNice) {...}
-//
-// INSTANTIATE_TEST_SUITE_P(AnimalVariations, AnimalTest,
-//                          ConvertGenerator<ParamType::TupleT>(
-//                              Combine(Values("cat", "dog"),
-//                                      Values(BLACK, WHITE))));
-//
-template <typename T>
-internal::ParamConverterGenerator<T> ConvertGenerator(
-    internal::ParamGenerator<T> gen) {
-  return internal::ParamConverterGenerator<T>(gen);
-}
-
 #define TEST_P(test_suite_name, test_name)                                     \
  class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                     \
-      : public test_suite_name, private ::testing::internal::GTestNonCopyable {\
+      : public test_suite_name {                                               \
   public:                                                                     \
    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {}                    \
    void TestBody() override;                                                  \
@@ -469,6 +429,11 @@ internal::ParamConverterGenerator<T> ConvertGenerator(
      return 0;                                                                \
    }                                                                          \
    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_;               \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                         \
+    (const GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) &) = delete;     \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) & operator=(            \
+        const GTEST_TEST_CLASS_NAME_(test_suite_name,                          \
+                                     test_name) &) = delete; /* NOLINT */      \
  };                                                                           \
  int GTEST_TEST_CLASS_NAME_(test_suite_name,                                  \
                             test_name)::gtest_registering_dummy_ =            \
@@ -108,7 +108,6 @@
 #include <string>
 #include <tuple>
 #include <type_traits>
-#include <typeinfo>
 #include <utility>
 #include <vector>

@@ -385,7 +384,7 @@ GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char32_t);

 GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
 GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
-#ifdef __cpp_lib_char8_t
+#ifdef __cpp_char8_t
 GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char8_t, ::std::u8string);
 GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char8_t, ::std::u8string);
 #endif
@@ -485,81 +484,6 @@ GTEST_API_ void PrintTo(__uint128_t v, ::std::ostream* os);
 GTEST_API_ void PrintTo(__int128_t v, ::std::ostream* os);
 #endif  // __SIZEOF_INT128__

-// The default resolution used to print floating-point values uses only
-// 6 digits, which can be confusing if a test compares two values whose
-// difference lies in the 7th digit.  So we'd like to print out numbers
-// in full precision.
-// However if the value is something simple like 1.1, full will print a
-// long string like 1.100000001 due to floating-point numbers not using
-// a base of 10.  This routiune returns an appropriate resolution for a
-// given floating-point number, that is, 6 if it will be accurate, or a
-// max_digits10 value (full precision) if it won't,  for values between
-// 0.0001 and one million.
-// It does this by computing what those digits would be (by multiplying
-// by an appropriate power of 10), then dividing by that power again to
-// see if gets the original value back.
-// A similar algorithm applies for values larger than one million; note
-// that for those values, we must divide to get a six-digit number, and
-// then multiply to possibly get the original value again.
-template <typename FloatType>
-int AppropriateResolution(FloatType val) {
-  int full = std::numeric_limits<FloatType>::max_digits10;
-  if (val < 0) val = -val;
-
-  if (val < 1000000) {
-    FloatType mulfor6 = 1e10;
-    if (val >= 100000.0) {  // 100,000 to 999,999
-      mulfor6 = 1.0;
-    } else if (val >= 10000.0) {
-      mulfor6 = 1e1;
-    } else if (val >= 1000.0) {
-      mulfor6 = 1e2;
-    } else if (val >= 100.0) {
-      mulfor6 = 1e3;
-    } else if (val >= 10.0) {
-      mulfor6 = 1e4;
-    } else if (val >= 1.0) {
-      mulfor6 = 1e5;
-    } else if (val >= 0.1) {
-      mulfor6 = 1e6;
-    } else if (val >= 0.01) {
-      mulfor6 = 1e7;
-    } else if (val >= 0.001) {
-      mulfor6 = 1e8;
-    } else if (val >= 0.0001) {
-      mulfor6 = 1e9;
-    }
-    if (static_cast<int32_t>(val * mulfor6 + 0.5) / mulfor6 == val) return 6;
-  } else if (val < 1e10) {
-    FloatType divfor6 = 1.0;
-    if (val >= 1e9) {  // 1,000,000,000 to 9,999,999,999
-      divfor6 = 10000;
-    } else if (val >= 1e8) {  // 100,000,000 to 999,999,999
-      divfor6 = 1000;
-    } else if (val >= 1e7) {  // 10,000,000 to 99,999,999
-      divfor6 = 100;
-    } else if (val >= 1e6) {  // 1,000,000 to 9,999,999
-      divfor6 = 10;
-    }
-    if (static_cast<int32_t>(val / divfor6 + 0.5) * divfor6 == val) return 6;
-  }
-  return full;
-}
-
-inline void PrintTo(float f, ::std::ostream* os) {
-  auto old_precision = os->precision();
-  os->precision(AppropriateResolution(f));
-  *os << f;
-  os->precision(old_precision);
-}
-
-inline void PrintTo(double d, ::std::ostream* os) {
-  auto old_precision = os->precision();
-  os->precision(AppropriateResolution(d));
-  *os << d;
-  os->precision(old_precision);
-}
-
 // Overloads for C strings.
 GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
 inline void PrintTo(char* s, ::std::ostream* os) {
@@ -632,7 +556,7 @@ inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
 }

 // Overloads for ::std::u8string
-#ifdef __cpp_lib_char8_t
+#ifdef __cpp_char8_t
 GTEST_API_ void PrintU8StringTo(const ::std::u8string& s, ::std::ostream* os);
 inline void PrintTo(const ::std::u8string& s, ::std::ostream* os) {
  PrintU8StringTo(s, os);
@@ -967,13 +891,6 @@ class UniversalTersePrinter<T&> {
    UniversalPrint(value, os);
  }
 };
-template <typename T>
-class UniversalTersePrinter<std::reference_wrapper<T>> {
- public:
-  static void Print(std::reference_wrapper<T> value, ::std::ostream* os) {
-    UniversalTersePrinter<T>::Print(value.get(), os);
-  }
-};
 template <typename T, size_t N>
 class UniversalTersePrinter<T[N]> {
 public:
@@ -33,8 +33,6 @@
 #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_SPI_H_

-#include <string>
-
 #include "gtest/gtest.h"

 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
@@ -35,8 +35,6 @@
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_TEST_PART_H_

 #include <iosfwd>
-#include <ostream>
-#include <string>
 #include <vector>

 #include "gtest/internal/gtest-internal.h"
@@ -50,14 +50,9 @@
 #define GOOGLETEST_INCLUDE_GTEST_GTEST_H_

 #include <cstddef>
-#include <cstdint>
-#include <iomanip>
 #include <limits>
 #include <memory>
 #include <ostream>
-#include <set>
-#include <sstream>
-#include <string>
 #include <type_traits>
 #include <vector>

@@ -195,17 +190,6 @@ void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
                                    const std::string& message);
 std::set<std::string>* GetIgnoredParameterizedTestSuites();

-// A base class that prevents subclasses from being copyable.
-// We do this instead of using '= delete' so as to avoid triggering warnings
-// inside user code regarding any of our declarations.
-class GTestNonCopyable {
- public:
-  GTestNonCopyable() = default;
-  GTestNonCopyable(const GTestNonCopyable &) = delete;
-  GTestNonCopyable &operator=(const GTestNonCopyable &) = delete;
-  ~GTestNonCopyable() = default;
-};
-
 }  // namespace internal

 // The friend relationship of some of these classes is cyclic.
@@ -301,7 +285,7 @@ class GTEST_API_ Test {
  // SetUp/TearDown method of Environment objects registered with Google
  // Test) will be output as attributes of the <testsuites> element.
  static void RecordProperty(const std::string& key, const std::string& value);
-  static void RecordProperty(const std::string& key, int64_t value);
+  static void RecordProperty(const std::string& key, int value);

 protected:
  // Creates a Test object.
@@ -1641,7 +1625,7 @@ class GTEST_API_ AssertHelper {
 // the GetParam() method.
 //
 // Use it with one of the parameter generator defining functions, like Range(),
-// Values(), ValuesIn(), Bool(), Combine(), and ConvertGenerator<T>().
+// Values(), ValuesIn(), Bool(), and Combine().
 //
 // class FooTest : public ::testing::TestWithParam<int> {
 //  protected:
@@ -1739,9 +1723,9 @@ class TestWithParam : public Test, public WithParamInterface<T> {};
 #define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")

 // Like GTEST_FAIL(), but at the given source file location.
-#define GTEST_FAIL_AT(file, line)                \
-  return GTEST_MESSAGE_AT_(file, line, "Failed", \
-                           ::testing::TestPartResult::kFatalFailure)
+#define GTEST_FAIL_AT(file, line)         \
+  GTEST_MESSAGE_AT_(file, line, "Failed", \
+                    ::testing::TestPartResult::kFatalFailure)

 // Define this macro to 1 to omit the definition of FAIL(), which is a
 // generic name and clashes with some other libraries.
@@ -2079,7 +2063,9 @@ class GTEST_API_ ScopedTrace {

  ScopedTrace(const ScopedTrace&) = delete;
  ScopedTrace& operator=(const ScopedTrace&) = delete;
-};
+} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
+                            // c'tor and d'tor.  Therefore it doesn't
+                            // need to be used otherwise.

 // Causes a trace (including the source file path, the current line
 // number, and the given message) to be included in every test failure
@@ -2203,17 +2189,10 @@ constexpr bool StaticAssertTypeEq() noexcept {
 #define TEST_F(test_fixture, test_name) GTEST_TEST_F(test_fixture, test_name)
 #endif

-// Returns a path to a temporary directory, which should be writable. It is
-// implementation-dependent whether or not the path is terminated by the
-// directory-separator character.
+// Returns a path to temporary directory.
+// Tries to determine an appropriate directory for the platform.
 GTEST_API_ std::string TempDir();

-// Returns a path to a directory that contains ancillary data files that might
-// be used by tests. It is implementation dependent whether or not the path is
-// terminated by the directory-separator character. The directory and the files
-// in it should be considered read-only.
-GTEST_API_ std::string SrcDir();
-
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
@@ -42,7 +42,6 @@
 #include <stdio.h>

 #include <memory>
-#include <string>

 #include "gtest/gtest-matchers.h"
 #include "gtest/internal/gtest-internal.h"
@@ -100,7 +99,7 @@ class GTEST_API_ DeathTest {
    DeathTest* const test_;
    ReturnSentinel(const ReturnSentinel&) = delete;
    ReturnSentinel& operator=(const ReturnSentinel&) = delete;
-  };
+  } GTEST_ATTRIBUTE_UNUSED_;

  // An enumeration of possible roles that may be taken when a death
  // test is encountered.  EXECUTE means that the death test logic should
@@ -42,16 +42,11 @@
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_

-#include <string>
-
-#include "gtest/internal/gtest-port.h"
 #include "gtest/internal/gtest-string.h"

 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)

-#if GTEST_HAS_FILE_SYSTEM
-
 namespace testing {
 namespace internal {

@@ -204,16 +199,6 @@ class GTEST_API_ FilePath {
  // separators. Returns NULL if no path separator was found.
  const char* FindLastPathSeparator() const;

-  // Returns the length of the path root, including the directory separator at
-  // the end of the prefix. Returns zero by definition if the path is relative.
-  // Examples:
-  // - [Windows] "..\Sibling" => 0
-  // - [Windows] "\Windows" => 1
-  // - [Windows] "C:/Windows\Notepad.exe" => 3
-  // - [Windows] "\\Host\Share\C$/Windows" => 13
-  // - [UNIX] "/bin" => 1
-  size_t CalculateRootLength() const;
-
  std::string pathname_;
 };  // class FilePath

@@ -222,6 +207,4 @@ class GTEST_API_ FilePath {

 GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251

-#endif  // GTEST_HAS_FILE_SYSTEM
-
 #endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
@@ -57,14 +57,12 @@
 #include <string.h>

 #include <cstdint>
-#include <functional>
 #include <iomanip>
 #include <limits>
 #include <map>
 #include <set>
 #include <string>
 #include <type_traits>
-#include <utility>
 #include <vector>

 #include "gtest/gtest-message.h"
@@ -463,7 +461,7 @@ class TestFactoryBase {
  TestFactoryBase& operator=(const TestFactoryBase&) = delete;
 };

-// This class provides implementation of TestFactoryBase interface.
+// This class provides implementation of TeastFactoryBase interface.
 // It is used in TEST and TEST_F macros.
 template <class TestClass>
 class TestFactoryImpl : public TestFactoryBase {
@@ -633,7 +631,7 @@ class GTEST_API_ TypedTestSuitePState {
                                        const char* registered_tests);

 private:
-  typedef ::std::map<std::string, CodeLocation, std::less<>> RegisteredTestsMap;
+  typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;

  bool registered_;
  RegisteredTestsMap registered_tests_;
@@ -831,7 +829,8 @@ class TypeParameterizedTestSuite<Fixture, internal::None, Types> {
 // For example, if Foo() calls Bar(), which in turn calls
 // GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
 // the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(int skip_count);
+GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(UnitTest* unit_test,
+                                                       int skip_count);

 // Helpers for suppressing warnings on unreachable code or constant
 // condition.
@@ -40,11 +40,8 @@

 #include <cassert>
 #include <iterator>
-#include <map>
 #include <memory>
-#include <ostream>
 #include <set>
-#include <string>
 #include <tuple>
 #include <type_traits>
 #include <utility>
@@ -953,78 +950,6 @@ class CartesianProductHolder {
  std::tuple<Gen...> generators_;
 };

-template <typename From, typename To>
-class ParamGeneratorConverter : public ParamGeneratorInterface<To> {
- public:
-  ParamGeneratorConverter(ParamGenerator<From> gen) // NOLINT
-      : generator_(std::move(gen)) {}
-
-  ParamIteratorInterface<To>* Begin() const override {
-    return new Iterator(this, generator_.begin(), generator_.end());
-  }
-  ParamIteratorInterface<To>* End() const override {
-    return new Iterator(this, generator_.end(), generator_.end());
-  }
-
- private:
-  class Iterator : public ParamIteratorInterface<To> {
-   public:
-    Iterator(const ParamGeneratorInterface<To>* base, ParamIterator<From> it,
-             ParamIterator<From> end)
-        : base_(base), it_(it), end_(end) {
-      if (it_ != end_) value_ = std::make_shared<To>(static_cast<To>(*it_));
-    }
-    ~Iterator() override {}
-
-    const ParamGeneratorInterface<To>* BaseGenerator() const override {
-      return base_;
-    }
-    void Advance() override {
-      ++it_;
-      if (it_ != end_) value_ = std::make_shared<To>(static_cast<To>(*it_));
-    }
-    ParamIteratorInterface<To>* Clone() const override {
-      return new Iterator(*this);
-    }
-    const To* Current() const override { return value_.get(); }
-    bool Equals(const ParamIteratorInterface<To>& other) const override {
-      // Having the same base generator guarantees that the other
-      // iterator is of the same type and we can downcast.
-      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
-          << "The program attempted to compare iterators "
-          << "from different generators." << std::endl;
-      const ParamIterator<From> other_it =
-          CheckedDowncastToActualType<const Iterator>(&other)->it_;
-      return it_ == other_it;
-    }
-
-   private:
-    Iterator(const Iterator& other) = default;
-
-    const ParamGeneratorInterface<To>* const base_;
-    ParamIterator<From> it_;
-    ParamIterator<From> end_;
-    std::shared_ptr<To> value_;
-  };  // class ParamGeneratorConverter::Iterator
-
-  ParamGenerator<From> generator_;
-};  // class ParamGeneratorConverter
-
-template <class Gen>
-class ParamConverterGenerator {
- public:
-  ParamConverterGenerator(ParamGenerator<Gen> g)  // NOLINT
-      : generator_(std::move(g)) {}
-
-  template <typename T>
-  operator ParamGenerator<T>() const {  // NOLINT
-    return ParamGenerator<T>(new ParamGeneratorConverter<Gen, T>(generator_));
-  }
-
- private:
-  ParamGenerator<Gen> generator_;
-};
-
 }  // namespace internal
 }  // namespace testing

@@ -111,8 +111,6 @@
 #define GTEST_OS_ESP32 1
 #elif defined(__XTENSA__)
 #define GTEST_OS_XTENSA 1
-#elif defined(__hexagon__)
-#define GTEST_OS_QURT 1
 #endif  // __CYGWIN__

 #endif  // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
@@ -83,8 +83,6 @@
 //   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
 //                              std::wstring does/doesn't work (Google Test can
 //                              be used where std::wstring is unavailable).
-//   GTEST_HAS_FILE_SYSTEM    - Define it to 1/0 to indicate whether or not a
-//                              file system is/isn't available.
 //   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
 //                              compiler supports Microsoft's "Structured
 //                              Exception Handling".
@@ -257,19 +255,6 @@
 //                                        deprecated; calling a marked function
 //                                        should generate a compiler warning

-// The definition of GTEST_INTERNAL_CPLUSPLUS_LANG comes first because it can
-// potentially be used as an #include guard.
-#if defined(_MSVC_LANG)
-#define GTEST_INTERNAL_CPLUSPLUS_LANG _MSVC_LANG
-#elif defined(__cplusplus)
-#define GTEST_INTERNAL_CPLUSPLUS_LANG __cplusplus
-#endif
-
-#if !defined(GTEST_INTERNAL_CPLUSPLUS_LANG) || \
-    GTEST_INTERNAL_CPLUSPLUS_LANG < 201402L
-#error C++ versions less than C++14 are not supported.
-#endif
-
 #include <ctype.h>   // for isspace, etc
 #include <stddef.h>  // for ptrdiff_t
 #include <stdio.h>
@@ -283,7 +268,6 @@
 #include <limits>
 #include <locale>
 #include <memory>
-#include <ostream>
 #include <string>
 // #include <mutex>  // Guarded by GTEST_IS_THREADSAFE below
 #include <tuple>
@@ -401,8 +385,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // On Android, <regex.h> is only available starting with Gingerbread.
 #define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
 #else
-#define GTEST_HAS_POSIX_RE \
-  !(GTEST_OS_WINDOWS || GTEST_OS_XTENSA || GTEST_OS_QURT)
+#define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS && !GTEST_OS_XTENSA)
 #endif
 #endif

@@ -474,16 +457,10 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // no support for it at least as recent as Froyo (2.2).
 #define GTEST_HAS_STD_WSTRING                                         \
  (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
-     GTEST_OS_HAIKU || GTEST_OS_ESP32 || GTEST_OS_ESP8266 ||          \
-     GTEST_OS_XTENSA || GTEST_OS_QURT))
+     GTEST_OS_HAIKU || GTEST_OS_ESP32 || GTEST_OS_ESP8266 || GTEST_OS_XTENSA))

 #endif  // GTEST_HAS_STD_WSTRING

-#ifndef GTEST_HAS_FILE_SYSTEM
-// Most platforms support a file system.
-#define GTEST_HAS_FILE_SYSTEM 1
-#endif  // GTEST_HAS_FILE_SYSTEM
-
 // Determines whether RTTI is available.
 #ifndef GTEST_HAS_RTTI
 // The user didn't tell us whether RTTI is enabled, so we need to
@@ -601,11 +578,9 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // output correctness and to implement death tests.
 #ifndef GTEST_HAS_STREAM_REDIRECTION
 // By default, we assume that stream redirection is supported on all
-// platforms except known mobile / embedded ones. Also, if the port doesn't have
-// a file system, stream redirection is not supported.
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE ||          \
-    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA || \
-    GTEST_OS_QURT || !GTEST_HAS_FILE_SYSTEM
+// platforms except known mobile ones.
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
+    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
 #define GTEST_HAS_STREAM_REDIRECTION 0
 #else
 #define GTEST_HAS_STREAM_REDIRECTION 1
@@ -621,10 +596,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
     GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA ||           \
     GTEST_OS_DRAGONFLY || GTEST_OS_GNU_KFREEBSD || GTEST_OS_HAIKU ||     \
     GTEST_OS_GNU_HURD)
-// Death tests require a file system to work properly.
-#if GTEST_HAS_FILE_SYSTEM
 #define GTEST_HAS_DEATH_TEST 1
-#endif  // GTEST_HAS_FILE_SYSTEM
 #endif

 // Determines whether to support type-driven tests.
@@ -667,53 +639,41 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
  default:  // NOLINT
 #endif

-// GTEST_HAVE_ATTRIBUTE_
+// Use this annotation at the end of a struct/class definition to
+// prevent the compiler from optimizing away instances that are never
+// used.  This is useful when all interesting logic happens inside the
+// c'tor and / or d'tor.  Example:
 //
-// A function-like feature checking macro that is a wrapper around
-// `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
-// nonzero constant integer if the attribute is supported or 0 if not.
+//   struct Foo {
+//     Foo() { ... }
+//   } GTEST_ATTRIBUTE_UNUSED_;
 //
-// It evaluates to zero if `__has_attribute` is not defined by the compiler.
-//
-// GCC: https://gcc.gnu.org/gcc-5/changes.html
-// Clang: https://clang.llvm.org/docs/LanguageExtensions.html
-#ifdef __has_attribute
-#define GTEST_HAVE_ATTRIBUTE_(x) __has_attribute(x)
-#else
-#define GTEST_HAVE_ATTRIBUTE_(x) 0
-#endif
-
-// GTEST_HAVE_FEATURE_
-//
-// A function-like feature checking macro that is a wrapper around
-// `__has_feature`.
-#ifdef __has_feature
-#define GTEST_HAVE_FEATURE_(x) __has_feature(x)
-#else
-#define GTEST_HAVE_FEATURE_(x) 0
-#endif
-
-// Use this annotation after a variable or parameter declaration to tell the
+// Also use it after a variable or parameter declaration to tell the
 // compiler the variable/parameter does not have to be used.
-// Example:
-//
-//   GTEST_ATTRIBUTE_UNUSED_ int foo = bar();
-#if GTEST_HAVE_ATTRIBUTE_(unused)
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
 #define GTEST_ATTRIBUTE_UNUSED_ __attribute__((unused))
-#else
+#elif defined(__clang__)
+#if __has_attribute(unused)
+#define GTEST_ATTRIBUTE_UNUSED_ __attribute__((unused))
+#endif
+#endif
+#ifndef GTEST_ATTRIBUTE_UNUSED_
 #define GTEST_ATTRIBUTE_UNUSED_
 #endif

 // Use this annotation before a function that takes a printf format string.
-#if GTEST_HAVE_ATTRIBUTE_(format) && defined(__MINGW_PRINTF_FORMAT)
+#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
+#if defined(__MINGW_PRINTF_FORMAT)
 // MinGW has two different printf implementations. Ensure the format macro
 // matches the selected implementation. See
 // https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/.
 #define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
-  __attribute__((format(__MINGW_PRINTF_FORMAT, string_index, first_to_check)))
-#elif GTEST_HAVE_ATTRIBUTE_(format)
-#define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)   \
-  __attribute__((format(printf, string_index, first_to_check)))
+  __attribute__((                                             \
+      __format__(__MINGW_PRINTF_FORMAT, string_index, first_to_check)))
+#else
+#define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check) \
+  __attribute__((__format__(__printf__, string_index, first_to_check)))
+#endif
 #else
 #define GTEST_ATTRIBUTE_PRINTF_(string_index, first_to_check)
 #endif
@@ -723,11 +683,11 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 // following the argument list:
 //
 //   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
-#if GTEST_HAVE_ATTRIBUTE_(warn_unused_result)
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
 #define GTEST_MUST_USE_RESULT_ __attribute__((warn_unused_result))
 #else
 #define GTEST_MUST_USE_RESULT_
-#endif
+#endif  // __GNUC__ && !COMPILER_ICC

 // MS C++ compiler emits warning when a conditional expression is compile time
 // constant. In some contexts this warning is false positive and needs to be
@@ -783,7 +743,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 #elif GTEST_CREATE_SHARED_LIBRARY
 #define GTEST_API_ __declspec(dllexport)
 #endif
-#elif GTEST_HAVE_ATTRIBUTE_(visibility)
+#elif __GNUC__ >= 4 || defined(__clang__)
 #define GTEST_API_ __attribute__((visibility("default")))
 #endif  // _MSC_VER

@@ -797,17 +757,20 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 #define GTEST_DEFAULT_DEATH_TEST_STYLE "fast"
 #endif  // GTEST_DEFAULT_DEATH_TEST_STYLE

-#if GTEST_HAVE_ATTRIBUTE_(noinline)
+#ifdef __GNUC__
 // Ask the compiler to never inline a given function.
 #define GTEST_NO_INLINE_ __attribute__((noinline))
 #else
 #define GTEST_NO_INLINE_
 #endif

-#if GTEST_HAVE_ATTRIBUTE_(disable_tail_calls)
+#if defined(__clang__)
+// Nested ifs to avoid triggering MSVC warning.
+#if __has_attribute(disable_tail_calls)
 // Ask the compiler not to perform tail call optimization inside
 // the marked function.
 #define GTEST_NO_TAIL_CALL_ __attribute__((disable_tail_calls))
+#endif
 #elif __GNUC__
 #define GTEST_NO_TAIL_CALL_ \
  __attribute__((optimize("no-optimize-sibling-calls")))
@@ -826,35 +789,50 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;

 // A function level attribute to disable checking for use of uninitialized
 // memory when built with MemorySanitizer.
-#if GTEST_HAVE_ATTRIBUTE_(no_sanitize_memory)
+#if defined(__clang__)
+#if __has_feature(memory_sanitizer)
 #define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ __attribute__((no_sanitize_memory))
 #else
 #define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
-#endif
+#endif  // __has_feature(memory_sanitizer)
+#else
+#define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+#endif  // __clang__

 // A function level attribute to disable AddressSanitizer instrumentation.
-#if GTEST_HAVE_ATTRIBUTE_(no_sanitize_address)
+#if defined(__clang__)
+#if __has_feature(address_sanitizer)
 #define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
  __attribute__((no_sanitize_address))
 #else
 #define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
-#endif
+#endif  // __has_feature(address_sanitizer)
+#else
+#define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+#endif  // __clang__

 // A function level attribute to disable HWAddressSanitizer instrumentation.
-#if GTEST_HAVE_FEATURE_(hwaddress_sanitizer) && \
-    GTEST_HAVE_ATTRIBUTE_(no_sanitize)
+#if defined(__clang__)
+#if __has_feature(hwaddress_sanitizer)
 #define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ \
  __attribute__((no_sanitize("hwaddress")))
 #else
 #define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
-#endif
+#endif  // __has_feature(hwaddress_sanitizer)
+#else
+#define GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
+#endif  // __clang__

 // A function level attribute to disable ThreadSanitizer instrumentation.
-#if GTEST_HAVE_ATTRIBUTE_(no_sanitize_thread)
-#define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ __attribute((no_sanitize_thread))
+#if defined(__clang__)
+#if __has_feature(thread_sanitizer)
+#define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ __attribute__((no_sanitize_thread))
 #else
 #define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
-#endif
+#endif  // __has_feature(thread_sanitizer)
+#else
+#define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+#endif  // __clang__

 namespace testing {

@@ -1732,7 +1710,7 @@ typedef GTestMutexLock MutexLock;
 // C-linkage.  Therefore it cannot be templatized to access
 // ThreadLocal<T>.  Hence the need for class
 // ThreadLocalValueHolderBase.
-class GTEST_API_ ThreadLocalValueHolderBase {
+class ThreadLocalValueHolderBase {
 public:
  virtual ~ThreadLocalValueHolderBase() {}
 };
@@ -1978,55 +1956,12 @@ inline std::string StripTrailingSpaces(std::string str) {

 namespace posix {

-// File system porting.
-#if GTEST_HAS_FILE_SYSTEM
+// Functions with a different name on Windows.
+
 #if GTEST_OS_WINDOWS

 typedef struct _stat StatStruct;

-#if GTEST_OS_WINDOWS_MOBILE
-inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
-// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
-// time and thus not defined there.
-#else
-inline int FileNo(FILE* file) { return _fileno(file); }
-inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
-inline int RmDir(const char* dir) { return _rmdir(dir); }
-inline bool IsDir(const StatStruct& st) { return (_S_IFDIR & st.st_mode) != 0; }
-#endif  // GTEST_OS_WINDOWS_MOBILE
-
-#elif GTEST_OS_ESP8266
-typedef struct stat StatStruct;
-
-inline int FileNo(FILE* file) { return fileno(file); }
-inline int Stat(const char* path, StatStruct* buf) {
-  // stat function not implemented on ESP8266
-  return 0;
-}
-inline int RmDir(const char* dir) { return rmdir(dir); }
-inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
-
-#else
-
-typedef struct stat StatStruct;
-
-inline int FileNo(FILE* file) { return fileno(file); }
-inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
-#if GTEST_OS_QURT
-// QuRT doesn't support any directory functions, including rmdir
-inline int RmDir(const char*) { return 0; }
-#else
-inline int RmDir(const char* dir) { return rmdir(dir); }
-#endif
-inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
-
-#endif  // GTEST_OS_WINDOWS
-#endif  // GTEST_HAS_FILE_SYSTEM
-
-// Other functions with a different name on Windows.
-
-#if GTEST_OS_WINDOWS
-
 #ifdef __BORLANDC__
 inline int DoIsATTY(int fd) { return isatty(fd); }
 inline int StrCaseCmp(const char* s1, const char* s2) {
@@ -2046,21 +1981,46 @@ inline int StrCaseCmp(const char* s1, const char* s2) {
 inline char* StrDup(const char* src) { return _strdup(src); }
 #endif  // __BORLANDC__

-#elif GTEST_OS_ESP8266
+#if GTEST_OS_WINDOWS_MOBILE
+inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
+// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
+// time and thus not defined there.
+#else
+inline int FileNo(FILE* file) { return _fileno(file); }
+inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
+inline int RmDir(const char* dir) { return _rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return (_S_IFDIR & st.st_mode) != 0; }
+#endif  // GTEST_OS_WINDOWS_MOBILE

+#elif GTEST_OS_ESP8266
+typedef struct stat StatStruct;
+
+inline int FileNo(FILE* file) { return fileno(file); }
 inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int Stat(const char* path, StatStruct* buf) {
+  // stat function not implemented on ESP8266
+  return 0;
+}
 inline int StrCaseCmp(const char* s1, const char* s2) {
  return strcasecmp(s1, s2);
 }
 inline char* StrDup(const char* src) { return strdup(src); }
+inline int RmDir(const char* dir) { return rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }

 #else

+typedef struct stat StatStruct;
+
+inline int FileNo(FILE* file) { return fileno(file); }
 inline int DoIsATTY(int fd) { return isatty(fd); }
+inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
 inline int StrCaseCmp(const char* s1, const char* s2) {
  return strcasecmp(s1, s2);
 }
 inline char* StrDup(const char* src) { return strdup(src); }
+inline int RmDir(const char* dir) { return rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }

 #endif  // GTEST_OS_WINDOWS

@@ -2082,10 +2042,9 @@ GTEST_DISABLE_MSC_DEPRECATED_PUSH_()
 // ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
 // StrError() aren't needed on Windows CE at this time and thus not
 // defined there.
-#if GTEST_HAS_FILE_SYSTEM
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE &&           \
-    !GTEST_OS_WINDOWS_RT && !GTEST_OS_ESP8266 && !GTEST_OS_XTENSA && \
-    !GTEST_OS_QURT
+
+#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && \
+    !GTEST_OS_WINDOWS_RT && !GTEST_OS_ESP8266 && !GTEST_OS_XTENSA
 inline int ChDir(const char* dir) { return chdir(dir); }
 #endif
 inline FILE* FOpen(const char* path, const char* mode) {
@@ -2099,14 +2058,14 @@ inline FILE* FOpen(const char* path, const char* mode) {
  return fopen(path, mode);
 #endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
 }
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
+#if !GTEST_OS_WINDOWS_MOBILE
 inline FILE* FReopen(const char* path, const char* mode, FILE* stream) {
  return freopen(path, mode, stream);
 }
 inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
-#endif  // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
+#endif
 inline int FClose(FILE* fp) { return fclose(fp); }
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
+#if !GTEST_OS_WINDOWS_MOBILE
 inline int Read(int fd, void* buf, unsigned int count) {
  return static_cast<int>(read(fd, buf, count));
 }
@@ -2114,17 +2073,11 @@ inline int Write(int fd, const void* buf, unsigned int count) {
  return static_cast<int>(write(fd, buf, count));
 }
 inline int Close(int fd) { return close(fd); }
-#endif  // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
-#endif  // GTEST_HAS_FILE_SYSTEM
-
-#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
 inline const char* StrError(int errnum) { return strerror(errnum); }
-#endif  // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_QURT
-
+#endif
 inline const char* GetEnv(const char* name) {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE ||          \
-    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA || \
-    GTEST_OS_QURT
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
+    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_XTENSA
  // We are on an embedded platform, which has no environment variables.
  static_cast<void>(name);  // To prevent 'unused argument' warning.
  return nullptr;
@@ -2156,7 +2109,7 @@ GTEST_DISABLE_MSC_DEPRECATED_POP_()
 // MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
 // function in order to achieve that.  We use macro definition here because
 // snprintf is a variadic function.
-#if defined(_MSC_VER) && !GTEST_OS_WINDOWS_MOBILE
+#if _MSC_VER && !GTEST_OS_WINDOWS_MOBILE
 // MSVC 2005 and above support variadic macros.
 #define GTEST_SNPRINTF_(buffer, size, format, ...) \
  _snprintf_s(buffer, size, size, format, __VA_ARGS__)
@@ -51,7 +51,6 @@
 #include <string.h>

 #include <cstdint>
-#include <sstream>
 #include <string>

 #include "gtest/internal/gtest-port.h"
@@ -37,10 +37,6 @@
 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_

-#include <string>
-#include <type_traits>
-#include <typeinfo>
-
 #include "gtest/internal/gtest-port.h"

 // #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
@@ -249,7 +249,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
    msg << "detected " << thread_count << " threads.";
  }
  msg << " See "
-         "https://github.com/google/googletest/blob/main/docs/"
+         "https://github.com/google/googletest/blob/master/docs/"
         "advanced.md#death-tests-and-threads"
      << " for more explanation and suggested solutions, especially if"
      << " this is the last message you see before your test times out.";
@@ -284,7 +284,7 @@ enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
 // message is propagated back to the parent process.  Otherwise, the
 // message is simply printed to stderr.  In either case, the program
 // then exits with status 1.
-[[noreturn]] static void DeathTestAbort(const std::string& message) {
+static void DeathTestAbort(const std::string& message) {
  // On a POSIX system, this function may be called from a threadsafe-style
  // death test child process, which operates on a very small stack.  Use
  // the heap for any additional non-minuscule memory requirements.
@@ -57,8 +57,6 @@
 #define GTEST_PATH_MAX_ _POSIX_PATH_MAX
 #endif  // GTEST_OS_WINDOWS

-#if GTEST_HAS_FILE_SYSTEM
-
 namespace testing {
 namespace internal {

@@ -98,7 +96,7 @@ static bool IsPathSeparator(char c) {
 FilePath FilePath::GetCurrentDir() {
 #if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE ||         \
    GTEST_OS_WINDOWS_RT || GTEST_OS_ESP8266 || GTEST_OS_ESP32 || \
-    GTEST_OS_XTENSA || GTEST_OS_QURT
+    GTEST_OS_XTENSA
  // These platforms do not have a current directory, so we just return
  // something reasonable.
  return FilePath(kCurrentDirectoryString);
@@ -147,45 +145,6 @@ const char* FilePath::FindLastPathSeparator() const {
  return last_sep;
 }

-size_t FilePath::CalculateRootLength() const {
-  const auto &path = pathname_;
-  auto s = path.begin();
-  auto end = path.end();
-#if GTEST_OS_WINDOWS
-  if (end - s >= 2 && s[1] == ':' &&
-      (end - s == 2 || IsPathSeparator(s[2])) &&
-      (('A' <= s[0] && s[0] <= 'Z') || ('a' <= s[0] && s[0] <= 'z'))) {
-    // A typical absolute path like "C:\Windows" or "D:"
-    s += 2;
-    if (s != end) {
-      ++s;
-    }
-  } else if (end - s >= 3 && IsPathSeparator(*s) && IsPathSeparator(*(s + 1))
-             && !IsPathSeparator(*(s + 2))) {
-    // Move past the "\\" prefix in a UNC path like "\\Server\Share\Folder"
-    s += 2;
-    // Skip 2 components and their following separators ("Server\" and "Share\")
-    for (int i = 0; i < 2; ++i) {
-      while (s != end) {
-        bool stop = IsPathSeparator(*s);
-        ++s;
-        if (stop) {
-          break;
-        }
-      }
-    }
-  } else if (s != end && IsPathSeparator(*s)) {
-    // A drive-rooted path like "\Windows"
-    ++s;
-  }
-#else
-  if (s != end && IsPathSeparator(*s)) {
-    ++s;
-  }
-#endif
-  return static_cast<size_t>(s - path.begin());
-}
-
 // Returns a copy of the FilePath with the directory part removed.
 // Example: FilePath("path/to/file").RemoveDirectoryName() returns
 // FilePath("file"). If there is no directory part ("just_a_file"), it returns
@@ -287,16 +246,26 @@ bool FilePath::DirectoryExists() const {
 }

 // Returns true if pathname describes a root directory. (Windows has one
-// root directory per disk drive. UNC share roots are also included.)
+// root directory per disk drive.)
 bool FilePath::IsRootDirectory() const {
-  size_t root_length = CalculateRootLength();
-  return root_length > 0 && root_length == pathname_.size() &&
-         IsPathSeparator(pathname_[root_length - 1]);
+#if GTEST_OS_WINDOWS
+  return pathname_.length() == 3 && IsAbsolutePath();
+#else
+  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
+#endif
 }

 // Returns true if pathname describes an absolute path.
 bool FilePath::IsAbsolutePath() const {
-  return CalculateRootLength() > 0;
+  const char* const name = pathname_.c_str();
+#if GTEST_OS_WINDOWS
+  return pathname_.length() >= 3 &&
+         ((name[0] >= 'a' && name[0] <= 'z') ||
+          (name[0] >= 'A' && name[0] <= 'Z')) &&
+         name[1] == ':' && IsPathSeparator(name[2]);
+#else
+  return IsPathSeparator(name[0]);
+#endif
 }

 // Returns a pathname for a file that does not currently exist. The pathname
@@ -354,7 +323,7 @@ bool FilePath::CreateFolder() const {
  delete[] unicode;
 #elif GTEST_OS_WINDOWS
  int result = _mkdir(pathname_.c_str());
-#elif GTEST_OS_ESP8266 || GTEST_OS_XTENSA || GTEST_OS_QURT
+#elif GTEST_OS_ESP8266 || GTEST_OS_XTENSA
  // do nothing
  int result = 0;
 #else
@@ -378,27 +347,17 @@ FilePath FilePath::RemoveTrailingPathSeparator() const {
 // Removes any redundant separators that might be in the pathname.
 // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
 // redundancies that might be in a pathname involving "." or "..".
-// Note that "\\Host\Share" does not contain a redundancy on Windows!
 void FilePath::Normalize() {
  auto out = pathname_.begin();

-  auto i = pathname_.cbegin();
-#if GTEST_OS_WINDOWS
-  // UNC paths are treated specially
-  if (pathname_.end() - i >= 3 && IsPathSeparator(*i) &&
-      IsPathSeparator(*(i + 1)) && !IsPathSeparator(*(i + 2))) {
-    *(out++) = kPathSeparator;
-    *(out++) = kPathSeparator;
-  }
-#endif
-  while (i != pathname_.end()) {
-    const char character = *i;
+  for (const char character : pathname_) {
    if (!IsPathSeparator(character)) {
      *(out++) = character;
    } else if (out == pathname_.begin() || *std::prev(out) != kPathSeparator) {
      *(out++) = kPathSeparator;
+    } else {
+      continue;
    }
-    ++i;
  }

  pathname_.erase(out, pathname_.end());
@@ -406,5 +365,3 @@ void FilePath::Normalize() {

 }  // namespace internal
 }  // namespace testing
-
-#endif  // GTEST_HAS_FILE_SYSTEM
@@ -44,7 +44,6 @@
 #include <algorithm>
 #include <cstdint>
 #include <memory>
-#include <set>
 #include <string>
 #include <vector>

@@ -213,7 +212,7 @@ class GTestFlagSaver {
  int32_t stack_trace_depth_;
  std::string stream_result_to_;
  bool throw_on_failure_;
-};
+} GTEST_ATTRIBUTE_UNUSED_;

 // Converts a Unicode code point to a narrow string in UTF-8 encoding.
 // code_point parameter is of type UInt32 because wchar_t may not be
@@ -397,11 +396,9 @@ class GTEST_API_ UnitTestOptions {
  static bool MatchesFilter(const std::string& name, const char* filter);
 };

-#if GTEST_HAS_FILE_SYSTEM
 // Returns the current application's name, removing directory path if that
 // is present.  Used by UnitTestOptions::GetOutputFile.
 GTEST_API_ FilePath GetCurrentExecutableName();
-#endif  // GTEST_HAS_FILE_SYSTEM

 // The role interface for getting the OS stack trace as a string.
 class OsStackTraceGetterInterface {
@@ -510,9 +507,9 @@ class GTEST_API_ UnitTestImpl {
  virtual ~UnitTestImpl();

  // There are two different ways to register your own TestPartResultReporter.
-  // You can register your own reporter to listen either only for test results
+  // You can register your own repoter to listen either only for test results
  // from the current thread or for results from all threads.
-  // By default, each per-thread test result reporter just passes a new
+  // By default, each per-thread test result repoter just passes a new
  // TestPartResult to the global test result reporter, which registers the
  // test part result for the currently running test.

@@ -843,11 +840,9 @@ class GTEST_API_ UnitTestImpl {
  // The UnitTest object that owns this implementation object.
  UnitTest* const parent_;

-#if GTEST_HAS_FILE_SYSTEM
  // The working directory when the first TEST() or TEST_F() was
  // executed.
  internal::FilePath original_working_dir_;
-#endif  // GTEST_HAS_FILE_SYSTEM

  // The default test part result reporters.
  DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
@@ -855,7 +850,7 @@ class GTEST_API_ UnitTestImpl {
      default_per_thread_test_part_result_reporter_;

  // Points to (but doesn't own) the global test part result reporter.
-  TestPartResultReporterInterface* global_test_part_result_reporter_;
+  TestPartResultReporterInterface* global_test_part_result_repoter_;

  // Protects read and write access to global_test_part_result_reporter_.
  internal::Mutex global_test_part_result_reporter_mutex_;
@@ -315,7 +315,7 @@ void PrintTo(__uint128_t v, ::std::ostream* os) {
    low = low / 10 + high_mod * 1844674407370955161 + carry / 10;

    char digit = static_cast<char>(carry % 10);
-    *--p = static_cast<char>('0' + digit);
+    *--p = '0' + digit;
  }
  *os << p;
 }
@@ -58,7 +58,6 @@
 #include "gtest/gtest-assertion-result.h"
 #include "gtest/gtest-spi.h"
 #include "gtest/internal/custom/gtest.h"
-#include "gtest/internal/gtest-port.h"

 #if GTEST_OS_LINUX

@@ -144,14 +143,6 @@
 #include "absl/strings/str_replace.h"
 #endif  // GTEST_HAS_ABSL

-// Checks builtin compiler feature |x| while avoiding an extra layer of #ifdefs
-// at the callsite.
-#if defined(__has_builtin)
-#define GTEST_HAS_BUILTIN(x) __has_builtin(x)
-#else
-#define GTEST_HAS_BUILTIN(x) 0
-#endif  // defined(__has_builtin)
-
 namespace testing {

 using internal::CountIf;
@@ -195,7 +186,6 @@ const char kStackTraceMarker[] = "\nStack trace:\n";
 // is specified on the command line.
 bool g_help_flag = false;

-#if GTEST_HAS_FILE_SYSTEM
 // Utility function to Open File for Writing
 static FILE* OpenFileForWriting(const std::string& output_file) {
  FILE* fileout = nullptr;
@@ -210,7 +200,6 @@ static FILE* OpenFileForWriting(const std::string& output_file) {
  }
  return fileout;
 }
-#endif  // GTEST_HAS_FILE_SYSTEM

 }  // namespace internal

@@ -383,8 +372,6 @@ GTEST_DEFINE_string_(
 namespace testing {
 namespace internal {

-const uint32_t Random::kMaxRange;
-
 // Generates a random number from [0, range), using a Linear
 // Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
 // than kMaxRange.
@@ -623,7 +610,6 @@ static ::std::vector<std::string> g_argvs;
 #endif  // defined(GTEST_CUSTOM_GET_ARGVS_)
 }

-#if GTEST_HAS_FILE_SYSTEM
 // Returns the current application's name, removing directory path if that
 // is present.
 FilePath GetCurrentExecutableName() {
@@ -637,7 +623,6 @@ FilePath GetCurrentExecutableName() {

  return result.RemoveDirectoryName();
 }
-#endif  // GTEST_HAS_FILE_SYSTEM

 // Functions for processing the gtest_output flag.

@@ -652,7 +637,6 @@ std::string UnitTestOptions::GetOutputFormat() {
                           static_cast<size_t>(colon - gtest_output_flag));
 }

-#if GTEST_HAS_FILE_SYSTEM
 // Returns the name of the requested output file, or the default if none
 // was explicitly specified.
 std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
@@ -683,7 +667,6 @@ std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
      GetOutputFormat().c_str()));
  return result.string();
 }
-#endif  // GTEST_HAS_FILE_SYSTEM

 // Returns true if and only if the wildcard pattern matches the string. Each
 // pattern consists of regular characters, single-character wildcards (?), and
@@ -1025,14 +1008,14 @@ void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
 TestPartResultReporterInterface*
 UnitTestImpl::GetGlobalTestPartResultReporter() {
  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  return global_test_part_result_reporter_;
+  return global_test_part_result_repoter_;
 }

 // Sets the global test part result reporter.
 void UnitTestImpl::SetGlobalTestPartResultReporter(
    TestPartResultReporterInterface* reporter) {
  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
-  global_test_part_result_reporter_ = reporter;
+  global_test_part_result_repoter_ = reporter;
 }

 // Returns the test part result reporter for the current thread.
@@ -1130,24 +1113,17 @@ std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
 // A helper class for measuring elapsed times.
 class Timer {
 public:
-  Timer() : start_(clock::now()) {}
+  Timer() : start_(std::chrono::steady_clock::now()) {}

  // Return time elapsed in milliseconds since the timer was created.
  TimeInMillis Elapsed() {
    return std::chrono::duration_cast<std::chrono::milliseconds>(
-               clock::now() - start_)
+               std::chrono::steady_clock::now() - start_)
        .count();
  }

 private:
-  // Fall back to the system_clock when building with newlib on a system
-  // without a monotonic clock.
-#if defined(_NEWLIB_VERSION) && !defined(CLOCK_MONOTONIC)
-  using clock = std::chrono::system_clock;
-#else
-  using clock = std::chrono::steady_clock;
-#endif
-  clock::time_point start_;
+  std::chrono::steady_clock::time_point start_;
 };

 // Returns a timestamp as milliseconds since the epoch. Note this time may jump
@@ -2458,10 +2434,12 @@ void Test::TearDown() {}
 void Test::RecordProperty(const std::string& key, const std::string& value) {
  UnitTest::GetInstance()->RecordProperty(key, value);
 }
-// We do not define a customary serialization except for integers,
-// but other values could be logged in this way.
-void Test::RecordProperty(const std::string& key, int64_t value) {
-  RecordProperty(key, (Message() << value).GetString());
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, int value) {
+  Message value_message;
+  value_message << value;
+  RecordProperty(key, value_message.GetString().c_str());
 }

 namespace internal {
@@ -2733,8 +2711,7 @@ TestInfo::TestInfo(const std::string& a_test_suite_name,
                   internal::TypeId fixture_class_id,
                   internal::TestFactoryBase* factory)
    : test_suite_name_(a_test_suite_name),
-      // begin()/end() is MSVC 17.3.3 ASAN crash workaround (GitHub issue #3997)
-      name_(a_name.begin(), a_name.end()),
+      name_(a_name),
      type_param_(a_type_param ? new std::string(a_type_param) : nullptr),
      value_param_(a_value_param ? new std::string(a_value_param) : nullptr),
      location_(a_code_location),
@@ -2798,6 +2775,37 @@ void ReportInvalidTestSuiteType(const char* test_suite_name,
                                          code_location.line)
                    << " " << errors.GetString();
 }
+}  // namespace internal
+
+namespace {
+
+// A predicate that checks the test name of a TestInfo against a known
+// value.
+//
+// This is used for implementation of the TestSuite class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestNameIs is copyable.
+class TestNameIs {
+ public:
+  // Constructor.
+  //
+  // TestNameIs has NO default constructor.
+  explicit TestNameIs(const char* name) : name_(name) {}
+
+  // Returns true if and only if the test name of test_info matches name_.
+  bool operator()(const TestInfo* test_info) const {
+    return test_info && test_info->name() == name_;
+  }
+
+ private:
+  std::string name_;
+};
+
+}  // namespace
+
+namespace internal {

 // This method expands all parameterized tests registered with macros TEST_P
 // and INSTANTIATE_TEST_SUITE_P into regular tests and registers those.
@@ -3236,15 +3244,17 @@ bool ShouldUseColor(bool stdout_is_tty) {
    // On non-Windows platforms, we rely on the TERM variable.
    const char* const term = posix::GetEnv("TERM");
    const bool term_supports_color =
-        term != nullptr && (String::CStringEquals(term, "xterm") ||
-                            String::CStringEquals(term, "xterm-color") ||
-                            String::CStringEquals(term, "xterm-kitty") ||
-                            String::CStringEquals(term, "screen") ||
-                            String::CStringEquals(term, "tmux") ||
-                            String::CStringEquals(term, "rxvt-unicode") ||
-                            String::CStringEquals(term, "linux") ||
-                            String::CStringEquals(term, "cygwin") ||
-                            String::EndsWithCaseInsensitive(term, "-256color"));
+        String::CStringEquals(term, "xterm") ||
+        String::CStringEquals(term, "xterm-color") ||
+        String::CStringEquals(term, "xterm-256color") ||
+        String::CStringEquals(term, "screen") ||
+        String::CStringEquals(term, "screen-256color") ||
+        String::CStringEquals(term, "tmux") ||
+        String::CStringEquals(term, "tmux-256color") ||
+        String::CStringEquals(term, "rxvt-unicode") ||
+        String::CStringEquals(term, "rxvt-unicode-256color") ||
+        String::CStringEquals(term, "linux") ||
+        String::CStringEquals(term, "cygwin");
    return stdout_is_tty && term_supports_color;
 #endif  // GTEST_OS_WINDOWS
  }
@@ -3269,12 +3279,7 @@ static void ColoredPrintf(GTestColor color, const char* fmt, ...) {
  va_start(args, fmt);

  static const bool in_color_mode =
-#if GTEST_HAS_FILE_SYSTEM
      ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
-#else
-      false;
-#endif  // GTEST_HAS_FILE_SYSTEM
-
  const bool use_color = in_color_mode && (color != GTestColor::kDefault);

  if (!use_color) {
@@ -3879,7 +3884,6 @@ void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,

 // End TestEventRepeater

-#if GTEST_HAS_FILE_SYSTEM
 // This class generates an XML output file.
 class XmlUnitTestResultPrinter : public EmptyTestEventListener {
 public:
@@ -4427,9 +4431,7 @@ void XmlUnitTestResultPrinter::OutputXmlTestProperties(
 }

 // End XmlUnitTestResultPrinter
-#endif  // GTEST_HAS_FILE_SYSTEM

-#if GTEST_HAS_FILE_SYSTEM
 // This class generates an JSON output file.
 class JsonUnitTestResultPrinter : public EmptyTestEventListener {
 public:
@@ -4819,9 +4821,6 @@ void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
  // If there was a test failure outside of one of the test suites (like in a
  // test environment) include that in the output.
  if (unit_test.ad_hoc_test_result().Failed()) {
-    if (comma) {
-      *stream << ",\n";
-    }
    OutputJsonTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
  }

@@ -4870,7 +4869,6 @@ std::string JsonUnitTestResultPrinter::TestPropertiesAsJson(
 }

 // End JsonUnitTestResultPrinter
-#endif  // GTEST_HAS_FILE_SYSTEM

 #if GTEST_CAN_STREAM_RESULTS_

@@ -4888,8 +4886,7 @@ std::string StreamingListener::UrlEncode(const char* str) {
      case '=':
      case '&':
      case '\n':
-        result.push_back('%');
-        result.append(String::FormatByte(static_cast<unsigned char>(ch)));
+        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
        break;
      default:
        result.push_back(ch);
@@ -5010,7 +5007,6 @@ void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) {
 #endif  // GTEST_HAS_ABSL
 }

-#if GTEST_HAS_DEATH_TEST
 // A helper class that creates the premature-exit file in its
 // constructor and deletes the file in its destructor.
 class ScopedPrematureExitFile {
@@ -5030,7 +5026,7 @@ class ScopedPrematureExitFile {
  }

  ~ScopedPrematureExitFile() {
-#if !GTEST_OS_ESP8266
+#if !defined GTEST_OS_ESP8266
    if (!premature_exit_filepath_.empty()) {
      int retval = remove(premature_exit_filepath_.c_str());
      if (retval) {
@@ -5048,7 +5044,6 @@ class ScopedPrematureExitFile {
  ScopedPrematureExitFile(const ScopedPrematureExitFile&) = delete;
  ScopedPrematureExitFile& operator=(const ScopedPrematureExitFile&) = delete;
 };
-#endif  // GTEST_HAS_DEATH_TEST

 }  // namespace internal

@@ -5336,10 +5331,6 @@ void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
     (defined(__x86_64__) || defined(__i386__)))
      // with clang/gcc we can achieve the same effect on x86 by invoking int3
      asm("int3");
-#elif GTEST_HAS_BUILTIN(__builtin_trap)
-      __builtin_trap();
-#elif defined(SIGTRAP)
-      raise(SIGTRAP);
 #else
      // Dereference nullptr through a volatile pointer to prevent the compiler
      // from removing. We use this rather than abort() or __builtin_trap() for
@@ -5374,7 +5365,6 @@ void UnitTest::RecordProperty(const std::string& key,
 // We don't protect this under mutex_, as we only support calling it
 // from the main thread.
 int UnitTest::Run() {
-#if GTEST_HAS_DEATH_TEST
  const bool in_death_test_child_process =
      GTEST_FLAG_GET(internal_run_death_test).length() > 0;

@@ -5403,7 +5393,6 @@ int UnitTest::Run() {
      in_death_test_child_process
          ? nullptr
          : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
-#endif  // GTEST_HAS_DEATH_TEST

  // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
  // used for the duration of the program.
@@ -5459,13 +5448,11 @@ int UnitTest::Run() {
             : 1;
 }

-#if GTEST_HAS_FILE_SYSTEM
 // Returns the working directory when the first TEST() or TEST_F() was
 // executed.
 const char* UnitTest::original_working_dir() const {
  return impl_->original_working_dir_.c_str();
 }
-#endif  // GTEST_HAS_FILE_SYSTEM

 // Returns the TestSuite object for the test that's currently running,
 // or NULL if no test is running.
@@ -5529,7 +5516,7 @@ UnitTestImpl::UnitTestImpl(UnitTest* parent)
      GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
          default_global_test_part_result_reporter_(this),
      default_per_thread_test_part_result_reporter_(this),
-      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_reporter_(
+      GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_repoter_(
          &default_global_test_part_result_reporter_),
      per_thread_test_part_result_reporter_(
          &default_per_thread_test_part_result_reporter_),
@@ -5598,7 +5585,6 @@ void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
 // UnitTestOptions. Must not be called before InitGoogleTest.
 void UnitTestImpl::ConfigureXmlOutput() {
  const std::string& output_format = UnitTestOptions::GetOutputFormat();
-#if GTEST_HAS_FILE_SYSTEM
  if (output_format == "xml") {
    listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
@@ -5609,10 +5595,6 @@ void UnitTestImpl::ConfigureXmlOutput() {
    GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \""
                        << output_format << "\" ignored.";
  }
-#else
-  GTEST_LOG_(ERROR) << "ERROR: alternative output formats require "
-                    << "GTEST_HAS_FILE_SYSTEM to be enabled";
-#endif  // GTEST_HAS_FILE_SYSTEM
 }

 #if GTEST_CAN_STREAM_RESULTS_
@@ -5775,12 +5757,10 @@ bool UnitTestImpl::RunAllTests() {
  // user didn't call InitGoogleTest.
  PostFlagParsingInit();

-#if GTEST_HAS_FILE_SYSTEM
  // Even if sharding is not on, test runners may want to use the
  // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
  // protocol.
  internal::WriteToShardStatusFileIfNeeded();
-#endif  // GTEST_HAS_FILE_SYSTEM

  // True if and only if we are in a subprocess for running a thread-safe-style
  // death test.
@@ -5960,7 +5940,6 @@ bool UnitTestImpl::RunAllTests() {
  return !failed;
 }

-#if GTEST_HAS_FILE_SYSTEM
 // Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
 // if the variable is present. If a file already exists at this location, this
 // function will write over it. If the variable is present, but the file cannot
@@ -5980,7 +5959,6 @@ void WriteToShardStatusFileIfNeeded() {
    fclose(file);
  }
 }
-#endif  // GTEST_HAS_FILE_SYSTEM

 // Checks whether sharding is enabled by examining the relevant
 // environment variable values. If the variables are present,
@@ -6059,7 +6037,7 @@ bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
 // each TestSuite and TestInfo object.
 // If shard_tests == true, further filters tests based on sharding
 // variables in the environment - see
-// https://github.com/google/googletest/blob/main/docs/advanced.md
+// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md
 // . Returns the number of tests that should run.
 int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
  const int32_t total_shards = shard_tests == HONOR_SHARDING_PROTOCOL
@@ -6172,7 +6150,6 @@ void UnitTestImpl::ListTestsMatchingFilter() {
    }
  }
  fflush(stdout);
-  #if GTEST_HAS_FILE_SYSTEM
  const std::string& output_format = UnitTestOptions::GetOutputFormat();
  if (output_format == "xml" || output_format == "json") {
    FILE* fileout = OpenFileForWriting(
@@ -6190,7 +6167,6 @@ void UnitTestImpl::ListTestsMatchingFilter() {
    fprintf(fileout, "%s", StringStreamToString(&stream).c_str());
    fclose(fileout);
  }
-#endif  // GTEST_HAS_FILE_SYSTEM
 }

 // Sets the OS stack trace getter.
@@ -6269,7 +6245,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(int skip_count) {
+GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/, 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);
@@ -6579,7 +6555,7 @@ static bool ParseGoogleTestFlag(const char* const arg) {
  return false;
 }

-#if GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
 static void LoadFlagsFromFile(const std::string& path) {
  FILE* flagfile = posix::FOpen(path.c_str(), "r");
  if (!flagfile) {
@@ -6595,7 +6571,7 @@ static void LoadFlagsFromFile(const std::string& path) {
    if (!ParseGoogleTestFlag(lines[i].c_str())) g_help_flag = true;
  }
 }
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_

 // Parses the command line for Google Test flags, without initializing
 // other parts of Google Test.  The type parameter CharType can be
@@ -6612,12 +6588,12 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
    bool remove_flag = false;
    if (ParseGoogleTestFlag(arg)) {
      remove_flag = true;
-#if GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
    } else if (ParseFlag(arg, "flagfile", &flagfile_value)) {
      GTEST_FLAG_SET(flagfile, flagfile_value);
      LoadFlagsFromFile(flagfile_value);
      remove_flag = true;
-#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
    } else if (arg_string == "--help" || HasGoogleTestFlagPrefix(arg)) {
      // Both help flag and unrecognized Google Test flags (excluding
      // internal ones) trigger help display.
@@ -6765,13 +6741,12 @@ void InitGoogleTest() {
 #endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
 }

-#if !defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_) || \
-    !defined(GTEST_CUSTOM_SRCDIR_FUNCTION_)
-// Returns the value of the first environment variable that is set and contains
-// a non-empty string. If there are none, returns the "fallback" string. Adds
-// the director-separator character as a suffix if not provided in the
-// environment variable value.
-static std::string GetDirFromEnv(
+#if !defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
+// Return value of first environment variable that is set and contains
+// a non-empty string. If there are none, return the "fallback" string.
+// Since we like the temporary directory to have a directory separator suffix,
+// add it if not provided in the environment variable value.
+static std::string GetTempDirFromEnv(
    std::initializer_list<const char*> environment_variables,
    const char* fallback, char separator) {
  for (const char* variable_name : environment_variables) {
@@ -6791,35 +6766,11 @@ std::string TempDir() {
 #if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_)
  return GTEST_CUSTOM_TEMPDIR_FUNCTION_();
 #elif GTEST_OS_WINDOWS || GTEST_OS_WINDOWS_MOBILE
-  return GetDirFromEnv({"TEST_TMPDIR", "TEMP"}, "\\temp\\", '\\');
+  return GetTempDirFromEnv({"TEST_TMPDIR", "TEMP"}, "\\temp\\", '\\');
 #elif GTEST_OS_LINUX_ANDROID
-  return GetDirFromEnv({"TEST_TMPDIR", "TMPDIR"}, "/data/local/tmp/", '/');
+  return GetTempDirFromEnv({"TEST_TMPDIR", "TMPDIR"}, "/data/local/tmp/", '/');
 #else
-  return GetDirFromEnv({"TEST_TMPDIR", "TMPDIR"}, "/tmp/", '/');
-#endif
-}
-
-#if !defined(GTEST_CUSTOM_SRCDIR_FUNCTION_)
-// Returns the directory path (including terminating separator) of the current
-// executable as derived from argv[0].
-static std::string GetCurrentExecutableDirectory() {
-  internal::FilePath argv_0(internal::GetArgvs()[0]);
-  return argv_0.RemoveFileName().string();
-}
-#endif
-
-std::string SrcDir() {
-#if defined(GTEST_CUSTOM_SRCDIR_FUNCTION_)
-  return GTEST_CUSTOM_SRCDIR_FUNCTION_();
-#elif GTEST_OS_WINDOWS || GTEST_OS_WINDOWS_MOBILE
-  return GetDirFromEnv({"TEST_SRCDIR"}, GetCurrentExecutableDirectory().c_str(),
-                       '\\');
-#elif GTEST_OS_LINUX_ANDROID
-  return GetDirFromEnv({"TEST_SRCDIR"}, GetCurrentExecutableDirectory().c_str(),
-                       '/');
-#else
-  return GetDirFromEnv({"TEST_SRCDIR"}, GetCurrentExecutableDirectory().c_str(),
-                       '/');
+  return GetTempDirFromEnv({"TEST_TMPDIR", "TMPDIR"}, "/tmp/", '/');
 #endif
 }

@@ -32,12 +32,9 @@
 #include "gtest/gtest.h"

 #if GTEST_OS_ESP8266 || GTEST_OS_ESP32
-// Arduino-like platforms: program entry points are setup/loop instead of main.
-
 #if GTEST_OS_ESP8266
 extern "C" {
 #endif
-
 void setup() { testing::InitGoogleTest(); }

 void loop() { RUN_ALL_TESTS(); }
@@ -46,16 +43,7 @@ void loop() { RUN_ALL_TESTS(); }
 }
 #endif

-#elif GTEST_OS_QURT
-// QuRT: program entry point is main, but argc/argv are unusable.
-
-GTEST_API_ int main() {
-  printf("Running main() from %s\n", __FILE__);
-  testing::InitGoogleTest();
-  return RUN_ALL_TESTS();
-}
 #else
-// Normal platforms: program entry point is main, argc/argv are initialized.

 GTEST_API_ int main(int argc, char **argv) {
  printf("Running main() from %s\n", __FILE__);
@@ -78,7 +78,6 @@ class GTestColorTest(gtest_test_utils.TestCase):
    self.assert_(UsesColor('cygwin', None, None))
    self.assert_(UsesColor('xterm', None, None))
    self.assert_(UsesColor('xterm-color', None, None))
-    self.assert_(UsesColor('xterm-kitty', None, None))
    self.assert_(UsesColor('xterm-256color', None, None))

  def testFlagOnly(self):
@@ -35,8 +35,6 @@
 // This file is #included from gtest-internal.h.
 // Do not #include this file anywhere else!

-#include <string>
-
 #include "gtest/gtest.h"
 #include "gtest/internal/gtest-filepath.h"
 #include "src/gtest-internal-inl.h"
@@ -423,13 +421,8 @@ TEST(NormalizeTest, MultipleConsecutiveSeparatorsInMidstring) {
 // "/bar" == //bar" == "///bar"
 TEST(NormalizeTest, MultipleConsecutiveSeparatorsAtStringStart) {
  EXPECT_EQ(GTEST_PATH_SEP_ "bar", FilePath(GTEST_PATH_SEP_ "bar").string());
-#if GTEST_OS_WINDOWS
-  EXPECT_EQ(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar",
-            FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
-#else
  EXPECT_EQ(GTEST_PATH_SEP_ "bar",
            FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
-#endif
  EXPECT_EQ(
      GTEST_PATH_SEP_ "bar",
      FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
@@ -628,9 +621,6 @@ TEST(FilePathTest, IsAbsolutePath) {
  EXPECT_TRUE(
      FilePath("c:/" GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative")
          .IsAbsolutePath());
-  EXPECT_TRUE(FilePath("d:/Windows").IsAbsolutePath());
-  EXPECT_TRUE(FilePath("\\\\Host\\Share").IsAbsolutePath());
-  EXPECT_TRUE(FilePath("\\\\Host\\Share\\Folder").IsAbsolutePath());
 #else
  EXPECT_TRUE(FilePath(GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative")
                  .IsAbsolutePath());
@@ -647,16 +637,6 @@ TEST(FilePathTest, IsRootDirectory) {
  EXPECT_FALSE(FilePath("b:a").IsRootDirectory());
  EXPECT_FALSE(FilePath("8:/").IsRootDirectory());
  EXPECT_FALSE(FilePath("c|/").IsRootDirectory());
-  EXPECT_TRUE(FilePath("c:/").IsRootDirectory());
-  EXPECT_FALSE(FilePath("d:/Windows").IsRootDirectory());
-
-  // This is for backward compatibility, since callers (even in this library)
-  // have assumed IsRootDirectory() implies a trailing directory separator.
-  EXPECT_FALSE(FilePath("\\\\Host\\Share").IsRootDirectory());
-
-  EXPECT_TRUE(FilePath("\\\\Host\\Share\\").IsRootDirectory());
-  EXPECT_FALSE(FilePath("\\\\Host\\Share\\.").IsRootDirectory());
-  EXPECT_FALSE(FilePath("\\\\Host\\Share\\C$\\").IsRootDirectory());
 #else
  EXPECT_TRUE(FilePath("/").IsRootDirectory());
  EXPECT_TRUE(FilePath("//").IsRootDirectory());
@@ -30,9 +30,6 @@
 //
 // Tests for the Message class.

-#include <sstream>
-#include <string>
-
 #include "gtest/gtest-message.h"
 #include "gtest/gtest.h"

@@ -36,8 +36,6 @@
 // make-files on Windows and other platforms. Do not #include this file
 // anywhere else!

-#include <string>
-
 #include "gtest/gtest.h"

 #if GTEST_OS_WINDOWS_MOBILE
@@ -40,7 +40,6 @@
 #include <set>
 #include <sstream>
 #include <string>
-#include <tuple>
 #include <vector>

 #include "gtest/gtest.h"
@@ -52,7 +51,6 @@ using ::std::vector;
 using ::testing::AddGlobalTestEnvironment;
 using ::testing::Bool;
 using ::testing::Combine;
-using ::testing::ConvertGenerator;
 using ::testing::Message;
 using ::testing::Range;
 using ::testing::TestWithParam;
@@ -404,7 +402,7 @@ TEST(BoolTest, BoolWorks) {
 TEST(CombineTest, CombineWithTwoParameters) {
  const char* foo = "foo";
  const char* bar = "bar";
-  const ParamGenerator<std::tuple<const char*, int>> gen =
+  const ParamGenerator<std::tuple<const char*, int> > gen =
      Combine(Values(foo, bar), Values(3, 4));

  std::tuple<const char*, int> expected_values[] = {
@@ -415,7 +413,7 @@ TEST(CombineTest, CombineWithTwoParameters) {

 // Tests that Combine() with three parameters generates the expected sequence.
 TEST(CombineTest, CombineWithThreeParameters) {
-  const ParamGenerator<std::tuple<int, int, int>> gen =
+  const ParamGenerator<std::tuple<int, int, int> > gen =
      Combine(Values(0, 1), Values(3, 4), Values(5, 6));
  std::tuple<int, int, int> expected_values[] = {
      std::make_tuple(0, 3, 5), std::make_tuple(0, 3, 6),
@@ -429,7 +427,7 @@ TEST(CombineTest, CombineWithThreeParameters) {
 // sequence generates a sequence with the number of elements equal to the
 // number of elements in the sequence generated by the second parameter.
 TEST(CombineTest, CombineWithFirstParameterSingleValue) {
-  const ParamGenerator<std::tuple<int, int>> gen =
+  const ParamGenerator<std::tuple<int, int> > gen =
      Combine(Values(42), Values(0, 1));

  std::tuple<int, int> expected_values[] = {std::make_tuple(42, 0),
@@ -441,7 +439,7 @@ TEST(CombineTest, CombineWithFirstParameterSingleValue) {
 // sequence generates a sequence with the number of elements equal to the
 // number of elements in the sequence generated by the first parameter.
 TEST(CombineTest, CombineWithSecondParameterSingleValue) {
-  const ParamGenerator<std::tuple<int, int>> gen =
+  const ParamGenerator<std::tuple<int, int> > gen =
      Combine(Values(0, 1), Values(42));

  std::tuple<int, int> expected_values[] = {std::make_tuple(0, 42),
@@ -452,7 +450,7 @@ TEST(CombineTest, CombineWithSecondParameterSingleValue) {
 // Tests that when the first parameter produces an empty sequence,
 // Combine() produces an empty sequence, too.
 TEST(CombineTest, CombineWithFirstParameterEmptyRange) {
-  const ParamGenerator<std::tuple<int, int>> gen =
+  const ParamGenerator<std::tuple<int, int> > gen =
      Combine(Range(0, 0), Values(0, 1));
  VerifyGeneratorIsEmpty(gen);
 }
@@ -460,7 +458,7 @@ TEST(CombineTest, CombineWithFirstParameterEmptyRange) {
 // Tests that when the second parameter produces an empty sequence,
 // Combine() produces an empty sequence, too.
 TEST(CombineTest, CombineWithSecondParameterEmptyRange) {
-  const ParamGenerator<std::tuple<int, int>> gen =
+  const ParamGenerator<std::tuple<int, int> > gen =
      Combine(Values(0, 1), Range(1, 1));
  VerifyGeneratorIsEmpty(gen);
 }
@@ -471,7 +469,7 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) {
  const char* foo = "foo";
  const char* bar = "bar";
  const ParamGenerator<
-      std::tuple<const char*, int, int, int, int, int, int, int, int, int>>
+      std::tuple<const char*, int, int, int, int, int, int, int, int, int> >
      gen =
          Combine(Values(foo, bar), Values(1), Values(2), Values(3), Values(4),
                  Values(5), Values(6), Values(7), Values(8), Values(9));
@@ -499,11 +497,11 @@ class NonDefaultConstructAssignString {
 };

 TEST(CombineTest, NonDefaultConstructAssign) {
-  const ParamGenerator<std::tuple<int, NonDefaultConstructAssignString>> gen =
+  const ParamGenerator<std::tuple<int, NonDefaultConstructAssignString> > gen =
      Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
                                   NonDefaultConstructAssignString("B")));

-  ParamGenerator<std::tuple<int, NonDefaultConstructAssignString>>::iterator
+  ParamGenerator<std::tuple<int, NonDefaultConstructAssignString> >::iterator
      it = gen.begin();

  EXPECT_EQ(0, std::get<0>(*it));
@@ -525,64 +523,6 @@ TEST(CombineTest, NonDefaultConstructAssign) {
  EXPECT_TRUE(it == gen.end());
 }

-template <typename T>
-class ConstructFromT {
- public:
-  explicit ConstructFromT(const T& t) : t_(t) {}
-  template <typename... Args,
-            typename std::enable_if<sizeof...(Args) != 1, int>::type = 0>
-  ConstructFromT(Args&&... args) : t_(std::forward<Args>(args)...) {}
-
-  bool operator==(const ConstructFromT& other) const { return other.t_ == t_; }
-
-  const T& get() const { return t_; }
-
- private:
-  T t_;
-};
-
-TEST(ConvertTest, CombineWithTwoParameters) {
-  const char* foo = "foo";
-  const char* bar = "bar";
-  const ParamGenerator<ConstructFromT<std::tuple<const char*, int>>> gen =
-      ConvertGenerator<std::tuple<const char*, int>>(
-          Combine(Values(foo, bar), Values(3, 4)));
-
-  ConstructFromT<std::tuple<const char*, int>> expected_values[] = {
-      {foo, 3}, {foo, 4}, {bar, 3}, {bar, 4}};
-  VerifyGenerator(gen, expected_values);
-}
-
-TEST(ConvertTest, NonDefaultConstructAssign) {
-  const ParamGenerator<
-      ConstructFromT<std::tuple<int, NonDefaultConstructAssignString>>>
-      gen = ConvertGenerator<std::tuple<int, NonDefaultConstructAssignString>>(
-          Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
-                                       NonDefaultConstructAssignString("B"))));
-
-  ParamGenerator<ConstructFromT<
-      std::tuple<int, NonDefaultConstructAssignString>>>::iterator it =
-      gen.begin();
-
-  EXPECT_EQ(0, std::get<0>(it->get()));
-  EXPECT_EQ("A", std::get<1>(it->get()).str());
-  ++it;
-
-  EXPECT_EQ(0, std::get<0>(it->get()));
-  EXPECT_EQ("B", std::get<1>(it->get()).str());
-  ++it;
-
-  EXPECT_EQ(1, std::get<0>(it->get()));
-  EXPECT_EQ("A", std::get<1>(it->get()).str());
-  ++it;
-
-  EXPECT_EQ(1, std::get<0>(it->get()));
-  EXPECT_EQ("B", std::get<1>(it->get()).str());
-  ++it;
-
-  EXPECT_TRUE(it == gen.end());
-}
-
 // Tests that an generator produces correct sequence after being
 // assigned from another generator.
 TEST(ParamGeneratorTest, AssignmentWorks) {
@@ -881,7 +821,7 @@ TEST_F(PREFIX_WITH_MACRO(NamingTestNonParametrized),
 TEST(MacroNameing, LookupNames) {
  std::set<std::string> know_suite_names, know_test_names;

-  const auto& ins = testing::UnitTest::GetInstance();
+  auto ins = testing::UnitTest::GetInstance();
  int ts = 0;
  while (const testing::TestSuite* suite = ins->GetTestSuite(ts++)) {
    know_suite_names.insert(suite->name());
@@ -957,7 +897,7 @@ INSTANTIATE_TEST_SUITE_P(CustomParamNameLambda, CustomLambdaNamingTest,
                         });

 TEST(CustomNamingTest, CheckNameRegistry) {
-  const auto& unit_test = ::testing::UnitTest::GetInstance();
+  ::testing::UnitTest* unit_test = ::testing::UnitTest::GetInstance();
  std::set<std::string> test_names;
  for (int suite_num = 0; suite_num < unit_test->total_test_suite_count();
       ++suite_num) {
@@ -39,7 +39,6 @@
 #include <chrono>  // NOLINT
 #include <list>
 #include <memory>
-#include <string>
 #include <thread>   // NOLINT
 #include <utility>  // For std::pair and std::make_pair.
 #include <vector>
@@ -37,7 +37,6 @@
 #include <cstring>
 #include <deque>
 #include <forward_list>
-#include <functional>
 #include <limits>
 #include <list>
 #include <map>
@@ -194,11 +193,6 @@ OutputStream& operator<<(OutputStream& os,
  return os;
 }

-struct StreamableInLocal {};
-void operator<<(::std::ostream& os, const StreamableInLocal& /* x */) {
-  os << "StreamableInLocal";
-}
-
 // A user-defined streamable but recursively-defined container type in
 // a user namespace, it mimics therefore std::filesystem::path or
 // boost::filesystem::path.
@@ -458,15 +452,7 @@ TEST(PrintBuiltInTypeTest, Int128) {

 // Floating-points.
 TEST(PrintBuiltInTypeTest, FloatingPoints) {
-  // float (32-bit precision)
-  EXPECT_EQ("1.5", Print(1.5f));
-
-  EXPECT_EQ("1.0999999",  Print(1.09999990f));
-  EXPECT_EQ("1.1",        Print(1.10000002f));
-  EXPECT_EQ("1.10000014", Print(1.10000014f));
-  EXPECT_EQ("9e+09",      Print(9e9f));
-
-  // double
+  EXPECT_EQ("1.5", Print(1.5f));   // float
  EXPECT_EQ("-2.5", Print(-2.5));  // double
 }

@@ -1618,23 +1604,6 @@ TEST(PrintToStringTest, ContainsNonLatin) {
                          "\n    As Text: \"From ä — ẑ\"");
 }

-TEST(PrintToStringTest, PrintStreamableInLocal) {
-  EXPECT_STREQ("StreamableInLocal",
-               PrintToString(foo::StreamableInLocal()).c_str());
-}
-
-TEST(PrintToStringTest, PrintReferenceToStreamableInLocal) {
-  foo::StreamableInLocal s;
-  std::reference_wrapper<foo::StreamableInLocal> r(s);
-  EXPECT_STREQ("StreamableInLocal", PrintToString(r).c_str());
-}
-
-TEST(PrintToStringTest, PrintReferenceToStreamableInGlobal) {
-  StreamableInGlobal s;
-  std::reference_wrapper<StreamableInGlobal> r(s);
-  EXPECT_STREQ("StreamableInGlobal", PrintToString(r).c_str());
-}
-
 TEST(IsValidUTF8Test, IllFormedUTF8) {
  // The following test strings are ill-formed UTF-8 and are printed
  // as hex only (or ASCII, in case of ASCII bytes) because IsValidUTF8() is
@@ -30,7 +30,6 @@
 #include "test/gtest-typed-test_test.h"

 #include <set>
-#include <string>
 #include <type_traits>
 #include <vector>

@@ -106,7 +106,7 @@ const int kTypedTests = 1;
 // Since tests can be run in any order, the values the accessors that track
 // test execution (such as failed_test_count) can not be predicted.
 TEST(ApiTest, UnitTestImmutableAccessorsWork) {
-  const auto& unit_test = UnitTest::GetInstance();
+  UnitTest* unit_test = UnitTest::GetInstance();

  ASSERT_EQ(2 + kTypedTestSuites, unit_test->total_test_suite_count());
  EXPECT_EQ(1 + kTypedTestSuites, unit_test->test_suite_to_run_count());
@@ -224,7 +224,7 @@ TEST(DISABLED_Test, Dummy2) {}
 class FinalSuccessChecker : public Environment {
 protected:
  void TearDown() override {
-    const auto& unit_test = UnitTest::GetInstance();
+    UnitTest* unit_test = UnitTest::GetInstance();

    EXPECT_EQ(1 + kTypedTestSuites, unit_test->successful_test_suite_count());
    EXPECT_EQ(3 + kTypedTests, unit_test->successful_test_count());
@@ -1,97 +0,0 @@
-#include <sys/stat.h>
-
-#include <cstdlib>
-#include <cstring>
-#include <string>
-
-#include "gtest/gtest.h"
-#include "gtest/internal/gtest-port.h"
-
-namespace {
-
-class SetEnv {
- public:
-  // Sets the environment value with name `name` to `value`, unless `value` is
-  // nullptr, in which case it unsets it. Restores the original value on
-  // destruction.
-  SetEnv(const char* name, const char* value) : name_(name) {
-    const char* old_value = getenv(name);
-    if (old_value != nullptr) {
-      saved_value_ = old_value;
-      have_saved_value_ = true;
-    }
-    if (value == nullptr) {
-      GTEST_CHECK_POSIX_SUCCESS_(unsetenv(name));
-    } else {
-      GTEST_CHECK_POSIX_SUCCESS_(setenv(name, value, 1 /*overwrite*/));
-    }
-  }
-
-  ~SetEnv() {
-    if (have_saved_value_) {
-      GTEST_CHECK_POSIX_SUCCESS_(
-          setenv(name_.c_str(), saved_value_.c_str(), 1 /*overwrite*/));
-    } else {
-      GTEST_CHECK_POSIX_SUCCESS_(unsetenv(name_.c_str()));
-    }
-  }
-
- private:
-  std::string name_;
-  bool have_saved_value_ = false;
-  std::string saved_value_;
-};
-
-class MakeTempDir {
- public:
-  // Creates a directory with a unique name including `testname`.
-  // The destructor removes it.
-  explicit MakeTempDir(const std::string& testname) {
-    // mkdtemp requires that the last 6 characters of the input pattern
-    // are Xs, and the string is modified by replacing those characters.
-    std::string pattern = "/tmp/" + testname + "_XXXXXX";
-    GTEST_CHECK_(mkdtemp(pattern.data()) != nullptr);
-    dirname_ = pattern;
-  }
-
-  ~MakeTempDir() { GTEST_CHECK_POSIX_SUCCESS_(rmdir(dirname_.c_str())); }
-
-  const char* DirName() const { return dirname_.c_str(); }
-
- private:
-  std::string dirname_;
-};
-
-bool StartsWith(const std::string& str, const std::string& prefix) {
-  return str.substr(0, prefix.size()) == prefix;
-}
-
-TEST(TempDirTest, InEnvironment) {
-  // Since the test infrastructure might be verifying directory existence or
-  // even creating subdirectories, we need to be careful that the directories we
-  // specify are actually valid.
-  MakeTempDir temp_dir("TempDirTest_InEnvironment");
-  SetEnv set_env("TEST_TMPDIR", temp_dir.DirName());
-  EXPECT_TRUE(StartsWith(testing::TempDir(), temp_dir.DirName()));
-}
-
-TEST(TempDirTest, NotInEnvironment) {
-  SetEnv set_env("TEST_TMPDIR", nullptr);
-  EXPECT_NE(testing::TempDir(), "");
-}
-
-TEST(SrcDirTest, InEnvironment) {
-  // Since the test infrastructure might be verifying directory existence or
-  // even creating subdirectories, we need to be careful that the directories we
-  // specify are actually valid.
-  MakeTempDir temp_dir("SrcDirTest_InEnvironment");
-  SetEnv set_env("TEST_SRCDIR", temp_dir.DirName());
-  EXPECT_TRUE(StartsWith(testing::SrcDir(), temp_dir.DirName()));
-}
-
-TEST(SrcDirTest, NotInEnvironment) {
-  SetEnv set_env("TEST_SRCDIR", nullptr);
-  EXPECT_NE(testing::SrcDir(), "");
-}
-
-}  // namespace
@@ -45,7 +45,6 @@
 // stand-alone regression test.

 #include <iostream>
-#include <ostream>

 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"
@@ -61,7 +61,6 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
 #include <cstdint>
 #include <map>
 #include <ostream>
-#include <set>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
@@ -3455,10 +3454,10 @@ TEST_F(NoFatalFailureTest, MessageIsStreamable) {
  TestPartResultArray gtest_failures;
  {
    ScopedFakeTestPartResultReporter gtest_reporter(&gtest_failures);
-    EXPECT_NO_FATAL_FAILURE([] { FAIL() << "foo"; }()) << "my message";
+    EXPECT_NO_FATAL_FAILURE(FAIL() << "foo") << "my message";
  }
  ASSERT_EQ(2, gtest_failures.size());
-  EXPECT_EQ(TestPartResult::kFatalFailure,
+  EXPECT_EQ(TestPartResult::kNonFatalFailure,
            gtest_failures.GetTestPartResult(0).type());
  EXPECT_EQ(TestPartResult::kNonFatalFailure,
            gtest_failures.GetTestPartResult(1).type());
@@ -6637,9 +6636,6 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
  SetEnv("TERM", "xterm-color");      // TERM supports colors.
  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.

-  SetEnv("TERM", "xterm-kitty");      // TERM supports colors.
-  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
-
  SetEnv("TERM", "xterm-256color");   // TERM supports colors.
  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.

@@ -7707,7 +7703,7 @@ auto* dynamic_test = testing::RegisterTest(
    __LINE__, []() -> DynamicUnitTestFixture* { return new DynamicTest; });

 TEST(RegisterTest, WasRegistered) {
-  const auto& unittest = testing::UnitTest::GetInstance();
+  auto* unittest = testing::UnitTest::GetInstance();
  for (int i = 0; i < unittest->total_test_suite_count(); ++i) {
    auto* tests = unittest->GetTestSuite(i);
    if (tests->name() != std::string("DynamicUnitTestFixture")) continue;
@@ -39,7 +39,5 @@ class PropertyTwo : public testing::Test {
 };

 TEST_F(PropertyTwo, TestSomeProperties) {
-  // Validate we can write an unsigned size_t as a property
-  size_t prop_two = 2;
-  RecordProperty("TestSomeProperty", prop_two);
+  RecordProperty("TestSomeProperty", 2);
 }