diff options
| author | dim <dim@FreeBSD.org> | 2014-11-24 18:11:16 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-11-24 18:11:16 +0000 |
| commit | 6148c19c738a92f344008aa3f88f4e008bada0ee (patch) | |
| tree | d4426858455f04d0d8c25a2f9eb9ea5582ffe1b6 /contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h | |
| parent | 2c8643c6396b0a3db33430cf9380e70bbb9efce0 (diff) | |
| parent | 173a4f43a911175643bda81ee675e8d9269056ea (diff) | |
| download | FreeBSD-src-6148c19c738a92f344008aa3f88f4e008bada0ee.zip FreeBSD-src-6148c19c738a92f344008aa3f88f4e008bada0ee.tar.gz | |
Merge clang 3.5.0 release from ^/vendor/clang/dist, resolve conflicts,
and preserve our customizations, where necessary.
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h b/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h index ef81e69..c766974 100644 --- a/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h +++ b/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.h @@ -26,8 +26,13 @@ enum DeclUpdateKind { UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION, UPD_CXX_ADDED_ANONYMOUS_NAMESPACE, UPD_CXX_INSTANTIATED_STATIC_DATA_MEMBER, + UPD_CXX_INSTANTIATED_FUNCTION_DEFINITION, + UPD_CXX_INSTANTIATED_CLASS_DEFINITION, + UPD_CXX_RESOLVED_EXCEPTION_SPEC, UPD_CXX_DEDUCED_RETURN_TYPE, - UPD_DECL_MARKED_USED + UPD_DECL_MARKED_USED, + UPD_MANGLING_NUMBER, + UPD_STATIC_LOCAL_NUMBER }; TypeIdx TypeIdxFromBuiltin(const BuiltinType *BT); |
