maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove dead code. 

llvm-svn: 213013
This commit is contained in:
Richard Smith 2014-07-14 23:25:30 +00:00
parent c832ae3eae
commit 9ef089dc97
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/include/clang/Sema/Overload.h
View File

@ -339,7 +339,6 @@ namespace clang {
enum FailureKind { enum FailureKind {
no_conversion, no_conversion,
unrelated_class, unrelated_class,
suppressed_user,
bad_qualifiers, bad_qualifiers,
lvalue_ref_to_rvalue, lvalue_ref_to_rvalue,
rvalue_ref_to_lvalue rvalue_ref_to_lvalue

11
clang/lib/Sema/SemaOverload.cpp
View File

@ -1164,17 +1164,6 @@ TryUserDefinedConversion(Sema &S, Expr *From, QualType ToType,
ICS.Standard.Second = ICK_Derived_To_Base; ICS.Standard.Second = ICK_Derived_To_Base;
} }
} }
// C++ [over.best.ics]p4:
// However, when considering the argument of a user-defined
// conversion function that is a candidate by 13.3.1.3 when
// invoked for the copying of the temporary in the second step
// of a class copy-initialization, or by 13.3.1.4, 13.3.1.5, or
// 13.3.1.6 in all cases, only standard conversion sequences and
// ellipsis conversion sequences are allowed.
if (SuppressUserConversions && ICS.isUserDefined()) {
ICS.setBad(BadConversionSequence::suppressed_user, From, ToType);
}
} else if (UserDefResult == OR_Ambiguous && !SuppressUserConversions) { } else if (UserDefResult == OR_Ambiguous && !SuppressUserConversions) {
ICS.setAmbiguous(); ICS.setAmbiguous();
ICS.Ambiguous.setFromType(From->getType()); ICS.Ambiguous.setFromType(From->getType());