summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2014-05-20 15:44:42 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2014-05-20 15:44:42 +0000
commit32d832af98e917c1f2b58c165107bcb88bddc6e0 (patch)
tree4fecb725ca5ea71a315d2d2eabde9514dfc9259d
parenta714fcb02a35201b88b7deeb74e127fcb34d0dab (diff)
downloadbcm5719-llvm-32d832af98e917c1f2b58c165107bcb88bddc6e0.tar.gz
bcm5719-llvm-32d832af98e917c1f2b58c165107bcb88bddc6e0.zip
clang/test/SemaCXX/err_init_conversion_failed.cpp: Tweak for i686-msvc.
For targeting i686-msvc, declarations are seen as thiscall like; void (template_test::S::*)(const int &) __attribute__((thiscall)) void (template_test::S::*)(int) __attribute__((thiscall)) It didn't affect x86_64-msvc. llvm-svn: 209212
-rw-r--r--clang/test/SemaCXX/err_init_conversion_failed.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/SemaCXX/err_init_conversion_failed.cpp b/clang/test/SemaCXX/err_init_conversion_failed.cpp
index 14d49547438..e31f215b452 100644
--- a/clang/test/SemaCXX/err_init_conversion_failed.cpp
+++ b/clang/test/SemaCXX/err_init_conversion_failed.cpp
@@ -56,6 +56,6 @@ template <class P> struct S2 {
void test_15() {
S2<S> X = {&S::foo};
- // expected-error@-1{{cannot initialize a member subobject of type 'void (template_test::S::*)(const int &)' with an rvalue of type 'void (template_test::S::*)(int)': type mismatch at 1st parameter ('const int &' vs 'int')}}
+ // expected-error-re@-1{{cannot initialize a member subobject of type 'void (template_test::S::*)(const int &){{( __attribute__\(\(thiscall\)\))?}}' with an rvalue of type 'void (template_test::S::*)(int){{( __attribute__\(\(thiscall\)\))?}}': type mismatch at 1st parameter ('const int &' vs 'int')}}
}
}
OpenPOWER on IntegriCloud