diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/is_convertible/value.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c4ed61f5376..5768ea60708 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2011-04-08 Jason Merrill <jason@redhat.com> + + * testsuite/20_util/is_convertible/value.cc: Adjust. + 2011-04-11 Paolo Carlini <paolo.carlini@oracle.com> * testsuite/25_algorithms/inplace_merge/moveable.cc: Actually run diff --git a/libstdc++-v3/testsuite/20_util/is_convertible/value.cc b/libstdc++-v3/testsuite/20_util/is_convertible/value.cc index f6282a90196..fc6007ac555 100644 --- a/libstdc++-v3/testsuite/20_util/is_convertible/value.cc +++ b/libstdc++-v3/testsuite/20_util/is_convertible/value.cc @@ -93,7 +93,7 @@ void test01() const volatile int&>(false)) ); VERIFY( (test_relationship<is_convertible, volatile int, volatile int&>(false)) ); - VERIFY( (test_relationship<is_convertible, int(int), int(&)(int)>(false)) ); + VERIFY( (test_relationship<is_convertible, int(int), int(&)(int)>(true)) ); VERIFY( (test_relationship<is_convertible, int&, ExplicitClass>(false)) ); VERIFY( (test_relationship<is_convertible, void*, ExplicitClass>(false)) ); |