diff options
author | Roman Divacky <rdivacky@FreeBSD.org> | 2009-11-19 09:00:00 +0000 |
---|---|---|
committer | Roman Divacky <rdivacky@FreeBSD.org> | 2009-11-19 09:00:00 +0000 |
commit | f5bd02d290ff15268853e0456c130a1afa15e907 (patch) | |
tree | c7f5a7b6fd212399d821b83b22c1e6a42e8c4a0d /test/CXX/basic/basic.lookup/basic.lookup.qual/namespace.qual/p2.cpp | |
parent | b3d5a323a5ca92ea73443499cee2f15db1ff0fb3 (diff) | |
download | src-f5bd02d290ff15268853e0456c130a1afa15e907.tar.gz src-f5bd02d290ff15268853e0456c130a1afa15e907.zip |
Update clang to r89337.
Notes
Notes:
svn path=/vendor/clang/dist/; revision=199512
Diffstat (limited to 'test/CXX/basic/basic.lookup/basic.lookup.qual/namespace.qual/p2.cpp')
-rw-r--r-- | test/CXX/basic/basic.lookup/basic.lookup.qual/namespace.qual/p2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/CXX/basic/basic.lookup/basic.lookup.qual/namespace.qual/p2.cpp b/test/CXX/basic/basic.lookup/basic.lookup.qual/namespace.qual/p2.cpp index b32948b4a608..88bc813363fa 100644 --- a/test/CXX/basic/basic.lookup/basic.lookup.qual/namespace.qual/p2.cpp +++ b/test/CXX/basic/basic.lookup/basic.lookup.qual/namespace.qual/p2.cpp @@ -31,7 +31,7 @@ void test() { } namespace Numbers { - struct Number { + struct Number { // expected-note 2 {{candidate}} explicit Number(double d) : d(d) {} double d; }; @@ -57,9 +57,9 @@ void test3() { int i = Ints::zero; Numbers2::f(i); - Numbers2::g(i); // expected-error {{incompatible type passing 'int'}} + Numbers2::g(i); // expected-error {{no viable conversion from 'int' to 'struct Numbers::Number' is possible}} float f = Floats::zero; Numbers2::f(f); - Numbers2::g(f); // expected-error {{incompatible type passing 'float'}} + Numbers2::g(f); // expected-error {{no viable conversion from 'float' to 'struct Numbers::Number' is possible}} } |