diff options
| -rw-r--r-- | lib/AST/DeclCXX.cpp | 4 | ||||
| -rw-r--r-- | test/SemaCXX/cxx98-compat.cpp | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index 217b27a8d1..eec2e9d3cf 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -344,8 +344,8 @@ GetBestOverloadCandidateSimple( if (Cands[Best].second.compatiblyIncludes(Cands[I].second)) Best = I; - for (unsigned I = 1; I != N; ++I) - if (Cands[Best].second.compatiblyIncludes(Cands[I].second)) + for (unsigned I = 0; I != N; ++I) + if (I != Best && Cands[Best].second.compatiblyIncludes(Cands[I].second)) return 0; return Cands[Best].first; diff --git a/test/SemaCXX/cxx98-compat.cpp b/test/SemaCXX/cxx98-compat.cpp index b9a8a1c65e..9bd854a664 100644 --- a/test/SemaCXX/cxx98-compat.cpp +++ b/test/SemaCXX/cxx98-compat.cpp @@ -335,3 +335,14 @@ namespace NullPointerTemplateArg { X<(int*)0> x; // expected-warning {{use of null pointer as non-type template argument is incompatible with C++98}} Y<(int A::*)0> y; // expected-warning {{use of null pointer as non-type template argument is incompatible with C++98}} } + +namespace PR13480 { + struct basic_iterator { + basic_iterator(const basic_iterator &it) {} + basic_iterator(basic_iterator &it) {} // expected-note {{because type 'PR13480::basic_iterator' has a user-declared copy constructor}} + }; + + union test { + basic_iterator it; // expected-warning {{union member 'it' with a non-trivial copy constructor is incompatible with C++98}} + }; +} |