From 0f7221ccb8220c32f67d5391d553df90cacbfd8c Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Sat, 18 Jul 2015 18:24:15 +0000 Subject: [PATCH] Fix up typos in a couple of tests; due to agressive short-circuiting, they never failed on clang or gcc, but MSVC whined. Patch by Andrew Parker. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@242618 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../stringbuf/stringbuf.virtuals/overflow.pass.cpp | 6 +++++- .../stringbuf/stringbuf.virtuals/pbackfail.pass.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/std/input.output/string.streams/stringbuf/stringbuf.virtuals/overflow.pass.cpp b/test/std/input.output/string.streams/stringbuf/stringbuf.virtuals/overflow.pass.cpp index 3abf9423a..67363b559 100644 --- a/test/std/input.output/string.streams/stringbuf/stringbuf.virtuals/overflow.pass.cpp +++ b/test/std/input.output/string.streams/stringbuf/stringbuf.virtuals/overflow.pass.cpp @@ -29,7 +29,7 @@ struct testbuf : base(str, which) {} typename base::int_type - overflow(typename base::int_type c = base::type_traits::eof()) + overflow(typename base::int_type c = base::traits_type::eof()) {++overflow_called; return base::overflow(c);} void pbump(int n) {base::pbump(n);} @@ -37,6 +37,10 @@ struct testbuf int main() { + { // sanity check + testbuf tb("");; + tb.overflow(); + } { testbuf sb("abc"); assert(sb.sputc('1') == '1'); diff --git a/test/std/input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail.pass.cpp b/test/std/input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail.pass.cpp index 4af0e6302..a0509008d 100644 --- a/test/std/input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail.pass.cpp +++ b/test/std/input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail.pass.cpp @@ -27,7 +27,7 @@ struct testbuf : base(str, which) {} typename base::int_type - pbackfail(typename base::int_type c = base::type_traits::eof()) + pbackfail(typename base::int_type c = base::traits_type::eof()) {return base::pbackfail(c);} void pbump(int n) {base::pbump(n);} @@ -35,6 +35,10 @@ struct testbuf int main() { + { // sanity check + testbuf tb("");; + tb.pbackfail(); + } { testbuf sb("123", std::ios_base::in); assert(sb.sgetc() == '1');