diff options
Diffstat (limited to 'include/clang/Sema/Overload.h')
| -rw-r--r-- | include/clang/Sema/Overload.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/clang/Sema/Overload.h b/include/clang/Sema/Overload.h index 2007dcb59ac5..20958b057a4f 100644 --- a/include/clang/Sema/Overload.h +++ b/include/clang/Sema/Overload.h @@ -83,7 +83,8 @@ namespace clang { ICK_TransparentUnionConversion, ///< Transparent Union Conversions ICK_Writeback_Conversion, ///< Objective-C ARC writeback conversion ICK_Zero_Event_Conversion, ///< Zero constant to event (OpenCL1.2 6.12.10) - ICK_Num_Conversion_Kinds ///< The number of conversion kinds + ICK_C_Only_Conversion, ///< Conversions allowed in C, but not C++ + ICK_Num_Conversion_Kinds, ///< The number of conversion kinds }; /// ImplicitConversionRank - The rank of an implicit conversion @@ -95,7 +96,9 @@ namespace clang { ICR_Promotion, ///< Promotion ICR_Conversion, ///< Conversion ICR_Complex_Real_Conversion, ///< Complex <-> Real conversion - ICR_Writeback_Conversion ///< ObjC ARC writeback conversion + ICR_Writeback_Conversion, ///< ObjC ARC writeback conversion + ICR_C_Conversion ///< Conversion only allowed in the C standard. + /// (e.g. void* to char*) }; ImplicitConversionRank GetConversionRank(ImplicitConversionKind Kind); |