summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h1
-rw-r--r--utils/unittest/googletest/include/gtest/internal/gtest-internal.h3
2 files changed, 1 insertions, 3 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h b/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h
index 65a2101a4d..6554cfc07e 100644
--- a/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h
+++ b/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h
@@ -203,7 +203,6 @@ class GTestFlagSaver {
bool list_tests_;
String output_;
bool print_time_;
- bool pretty_;
internal::Int32 random_seed_;
internal::Int32 repeat_;
bool shuffle_;
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-internal.h b/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
index b198a3d97a..f8a5cc9447 100644
--- a/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
+++ b/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
@@ -102,12 +102,11 @@
// but still find raw_ostream& overloads.
namespace llvm {
class convertible_fwd_ostream : public std::ostream {
- std::ostream& os_;
raw_os_ostream ros_;
public:
convertible_fwd_ostream(std::ostream& os)
- : std::ostream(os.rdbuf()), os_(os), ros_(*this) {}
+ : std::ostream(os.rdbuf()), ros_(*this) {}
operator raw_ostream&() { return ros_; }
};
}