From 4a3030784051dea52d8939d7bde776befb6d8bca Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Wed, 16 Jun 2010 16:22:04 +0000 Subject: Fixed conflict between objc_memmove_collectable builtin decl. and one ddefined in darwin header file. llvm-svn: 106107 --- clang/lib/Sema/SemaDeclCXX.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'clang/lib/Sema/SemaDeclCXX.cpp') diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index dfba2f835ac..2a881ff4348 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -4567,7 +4567,7 @@ void Sema::DefineImplicitCopyAssignment(SourceLocation CurrentLocation, // \brief Reference to the __builtin_memcpy function. Expr *BuiltinMemCpyRef = 0; - // \brief Reference to the objc_memmove_collectable function. + // \brief Reference to the __builtin_objc_memmove_collectable function. Expr *CollectableMemCpyRef = 0; // Assign non-static members. @@ -4652,8 +4652,9 @@ void Sema::DefineImplicitCopyAssignment(SourceLocation CurrentLocation, if (NeedsCollectableMemCpy) { if (!CollectableMemCpyRef) { - // Create a reference to the objc_memmove_collectable function. - LookupResult R(*this, &Context.Idents.get("objc_memmove_collectable"), + // Create a reference to the __builtin_objc_memmove_collectable function. + LookupResult R(*this, + &Context.Idents.get("__builtin_objc_memmove_collectable"), Loc, LookupOrdinaryName); LookupName(R, TUScope, true); -- cgit v1.2.3