From 955f9387516da03b51337b126bebb43567141173 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Wed, 6 Jun 2012 20:23:00 +0000 Subject: [PATCH] Remove dead private member variables from gtest. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158101 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../googletest/include/gtest/internal/gtest-internal-inl.h | 1 - .../googletest/include/gtest/internal/gtest-internal.h | 3 +-- 2 files changed, 1 insertion(+), 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 65a2101a4d8..6554cfc07e6 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 b198a3d97a2..f8a5cc9447b 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_; } }; }