diff options
| author | Copybara-Service <copybara-worker@google.com> | 2022-06-14 20:24:55 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-06-14 20:24:55 (GMT) |
| commit | 191ca1f3a9262b90a586ae2c2e8c742c3d867801 (patch) | |
| tree | bc769fd52eb06ceaad3c6b8ebcb41a4a84608151 | |
| parent | 8b521aa43aa570fb9a106099f12427ccff2a79cb (diff) | |
| parent | fe735a698657a7fffe6b5062c6bf5b13b6a6950c (diff) | |
| download | googletest-191ca1f3a9262b90a586ae2c2e8c742c3d867801.zip googletest-191ca1f3a9262b90a586ae2c2e8c742c3d867801.tar.gz googletest-191ca1f3a9262b90a586ae2c2e8c742c3d867801.tar.bz2 | |
Merge pull request #3863 from eidosmontreal:fix_unused-variable_warning
PiperOrigin-RevId: 454940948
Change-Id: Ic87dadfe9c6fc8882b0f425aa2056f0cc7a90b55
| -rw-r--r-- | googletest/src/gtest-port.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index 73a1115..d797fe4 100644 --- a/googletest/src/gtest-port.cc +++ b/googletest/src/gtest-port.cc @@ -90,15 +90,6 @@ namespace testing { namespace internal { -#if defined(_MSC_VER) || defined(__BORLANDC__) -// MSVC and C++Builder do not provide a definition of STDERR_FILENO. -const int kStdOutFileno = 1; -const int kStdErrFileno = 2; -#else -const int kStdOutFileno = STDOUT_FILENO; -const int kStdErrFileno = STDERR_FILENO; -#endif // _MSC_VER - #if GTEST_OS_LINUX || GTEST_OS_GNU_HURD namespace { @@ -1177,6 +1168,15 @@ static std::string GetCapturedStream(CapturedStream** captured_stream) { return content; } +#if defined(_MSC_VER) || defined(__BORLANDC__) +// MSVC and C++Builder do not provide a definition of STDERR_FILENO. +const int kStdOutFileno = 1; +const int kStdErrFileno = 2; +#else +const int kStdOutFileno = STDOUT_FILENO; +const int kStdErrFileno = STDERR_FILENO; +#endif // defined(_MSC_VER) || defined(__BORLANDC__) + // Starts capturing stdout. void CaptureStdout() { CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout); |