From c094f1ec9cc6ec1c94ed5e42d1c3e77e34c35e58 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Tue, 15 Sep 2020 19:31:55 -0700 Subject: [PATCH] Avoid a merge conflict with PR 1294. --- tests/libcxx/expected_results.txt | 2 +- tests/libcxx/skipped_tests.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/libcxx/expected_results.txt b/tests/libcxx/expected_results.txt index 8c59e9d2d2..7b4e0508b7 100644 --- a/tests/libcxx/expected_results.txt +++ b/tests/libcxx/expected_results.txt @@ -527,7 +527,7 @@ std/localization/locale.categories/category.monetary/locale.moneypunct/money_bas std/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp FAIL std/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp FAIL -# GH-1256 Our inheritance implementation is allowing this to compile when it shouldn't. +# STL bug: Our inheritance implementation is allowing this to compile when it shouldn't. std/numerics/complex.number/complex.special/double_long_double_implicit.compile.fail.cpp FAIL std/numerics/complex.number/complex.special/float_double_implicit.compile.fail.cpp FAIL std/numerics/complex.number/complex.special/float_long_double_implicit.compile.fail.cpp FAIL diff --git a/tests/libcxx/skipped_tests.txt b/tests/libcxx/skipped_tests.txt index 4d07def170..1966b0bbdb 100644 --- a/tests/libcxx/skipped_tests.txt +++ b/tests/libcxx/skipped_tests.txt @@ -527,7 +527,7 @@ localization\locale.categories\category.monetary\locale.moneypunct\money_base.pa input.output\file.streams\fstreams\filebuf.virtuals\overflow.pass.cpp input.output\file.streams\fstreams\filebuf.virtuals\underflow.pass.cpp -# GH-1256 Our inheritance implementation is allowing this to compile when it shouldn't. +# STL bug: Our inheritance implementation is allowing this to compile when it shouldn't. numerics\complex.number\complex.special\double_long_double_implicit.compile.fail.cpp numerics\complex.number\complex.special\float_double_implicit.compile.fail.cpp numerics\complex.number\complex.special\float_long_double_implicit.compile.fail.cpp