Fix noexcept merging with system headers.
authorJason Merrill <jason@redhat.com>
Tue, 3 Apr 2018 17:41:06 +0000 (13:41 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Tue, 3 Apr 2018 17:41:06 +0000 (13:41 -0400)
commit3f759575d3675150e665be997dd1e404e5c011f4
tree7b0657845dab376aef31f53dd521a51bfb06a5a6
parentb4231bf26e398d6799facf6bc93caeefd7d16d5a
Fix noexcept merging with system headers.

* typeck.c (merge_types): Limit matching attribute shortcut to
the default case.

From-SVN: r259042
gcc/cp/ChangeLog
gcc/cp/typeck.c
gcc/testsuite/g++.dg/cpp1z/noexcept-type19.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp1z/noexcept-type19.h [new file with mode: 0644]