diff options
Diffstat (limited to 'utils/unittest/googletest')
3 files changed, 2 insertions, 4 deletions
diff --git a/utils/unittest/googletest/gtest.cc b/utils/unittest/googletest/gtest.cc index 3fdff0a..eb5c68c 100644 --- a/utils/unittest/googletest/gtest.cc +++ b/utils/unittest/googletest/gtest.cc @@ -1465,7 +1465,7 @@ char* CodePointToUtf8(UInt32 code_point, char* str) { return str; } -// The following two functions only make sense if the the system +// The following two functions only make sense if the system // uses UTF-16 for wide string encoding. All supported systems // with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16. 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 65a2101..6554cfc 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 b198a3d..f8a5cc9 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_; } }; } |
