Avoid a merge conflict with PR 1294.

microsoft · Sep 16, 2020 · c094f1e · c094f1e
1 parent ac874ea
commit c094f1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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