summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCopybara-Service <copybara-worker@google.com>2023-08-08 17:26:39 (GMT)
committerCopybara-Service <copybara-worker@google.com>2023-08-08 17:26:39 (GMT)
commit89b25572dbd7668499d2cfd01dea905f8c44e019 (patch)
treeddb00889444722e032de40e85a031c61ae1cfc5a
parent46db91ef6ffcc128b2d5f31118ae1108109e3400 (diff)
parent9ef5e8226919b56d6760b48258e706d819409994 (diff)
downloadgoogletest-89b25572dbd7668499d2cfd01dea905f8c44e019.zip
googletest-89b25572dbd7668499d2cfd01dea905f8c44e019.tar.gz
googletest-89b25572dbd7668499d2cfd01dea905f8c44e019.tar.bz2
Merge pull request #4330 from IncludeGuardian:remove-iomanip
PiperOrigin-RevId: 554867591 Change-Id: Ib32da50384951532419cb54fb70f8ab0920178d7
-rw-r--r--googletest/include/gtest/gtest.h9
-rw-r--r--googletest/include/gtest/internal/gtest-internal.h1
2 files changed, 4 insertions, 6 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index de7d528..a932e68 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -51,7 +51,6 @@
#include <cstddef>
#include <cstdint>
-#include <iomanip>
#include <limits>
#include <memory>
#include <ostream>
@@ -1574,12 +1573,12 @@ AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
}
::std::stringstream lhs_ss;
- lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
- << lhs_value;
+ lhs_ss.precision(std::numeric_limits<RawType>::digits10 + 2);
+ lhs_ss << lhs_value;
::std::stringstream rhs_ss;
- rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
- << rhs_value;
+ rhs_ss.precision(std::numeric_limits<RawType>::digits10 + 2);
+ rhs_ss << rhs_value;
return EqFailure(lhs_expression, rhs_expression,
StringStreamToString(&lhs_ss), StringStreamToString(&rhs_ss),
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h
index a04a920..97a9833 100644
--- a/googletest/include/gtest/internal/gtest-internal.h
+++ b/googletest/include/gtest/internal/gtest-internal.h
@@ -58,7 +58,6 @@
#include <cstdint>
#include <functional>
-#include <iomanip>
#include <limits>
#include <map>
#include <set>