Author: stl_msft Date: Fri Aug 11 13:54:01 2017 New Revision: 310759 URL: http://llvm.org/viewvc/llvm-project?rev=310759&view=rev Log: [libcxx] [test] Rename __c to ch. NFCI.
This improves readability and (theoretically) improves portability, as __ugly names are reserved. Modified: libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp Modified: libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = str_.size(); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/ext.manip/put_time.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp Fri Aug 11 13:54:01 2017 @@ -41,18 +41,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = str_.size(); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp Fri Aug 11 13:54:01 2017 @@ -38,18 +38,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp Fri Aug 11 13:54:01 2017 @@ -39,18 +39,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(__c); + str_.push_back(ch); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(__c); + str_.push_back(ch); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(__c); + str_.push_back(ch); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(__c); + str_.push_back(ch); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp Fri Aug 11 13:54:01 2017 @@ -41,18 +41,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp Fri Aug 11 13:54:01 2017 @@ -37,18 +37,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } virtual int Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp Fri Aug 11 13:54:01 2017 @@ -35,18 +35,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp Fri Aug 11 13:54:01 2017 @@ -39,18 +39,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; Modified: libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp?rev=310759&r1=310758&r2=310759&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp Fri Aug 11 13:54:01 2017 @@ -34,18 +34,18 @@ public: protected: virtual typename base::int_type - overflow(typename base::int_type __c = base::traits_type::eof()) + overflow(typename base::int_type ch = base::traits_type::eof()) { - if (__c != base::traits_type::eof()) + if (ch != base::traits_type::eof()) { int n = static_cast<int>(str_.size()); - str_.push_back(static_cast<CharT>(__c)); + str_.push_back(static_cast<CharT>(ch)); str_.resize(str_.capacity()); base::setp(const_cast<CharT*>(str_.data()), const_cast<CharT*>(str_.data() + str_.size())); base::pbump(n+1); } - return __c; + return ch; } }; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits