Revert the flags change for now, I have a better idea for this.
llvm-svn: 80255
diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h
index 8a8e945..a5a0723 100644
--- a/clang/lib/Sema/Sema.h
+++ b/clang/lib/Sema/Sema.h
@@ -721,17 +721,13 @@
bool MergeCXXFunctionDecl(FunctionDecl *New, FunctionDecl *Old);
/// C++ Overloading.
- enum OverloadResolutionFlags {
- ORF_None = 0x0,
- ORF_SuppressUserConversions = 0x1,
- ORF_AllowExplicit = 0x2,
- ORF_ForceRValue = 0x4
- };
-
bool IsOverload(FunctionDecl *New, Decl* OldD,
OverloadedFunctionDecl::function_iterator &MatchedDecl);
ImplicitConversionSequence
- TryImplicitConversion(Expr* From, QualType ToType, unsigned Flags = ORF_None);
+ TryImplicitConversion(Expr* From, QualType ToType,
+ bool SuppressUserConversions = false,
+ bool AllowExplicit = false,
+ bool ForceRValue = false);
bool IsStandardConversion(Expr *From, QualType ToType,
StandardConversionSequence& SCS);
bool IsIntegralPromotion(Expr *From, QualType FromType, QualType ToType);