diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-07-12 23:20:13 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-07-12 23:20:13 +0000 |
| commit | c87c8799ec32a21dfb30992d3ab92f1feb2415a8 (patch) | |
| tree | ca06c454053b82cc49fad1e52f801da0894727f5 /clang/lib/AST | |
| parent | af6e82f6110f71d89e960109bfe7b1bc028cd16a (diff) | |
| download | bcm5719-llvm-c87c8799ec32a21dfb30992d3ab92f1feb2415a8.tar.gz bcm5719-llvm-c87c8799ec32a21dfb30992d3ab92f1feb2415a8.zip | |
revert fix for // rdar://9740328
llvm-svn: 135010
Diffstat (limited to 'clang/lib/AST')
| -rw-r--r-- | clang/lib/AST/ASTContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 71b76c9d328..6eada6e22f4 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -5442,7 +5442,7 @@ bool ASTContext::typesAreCompatible(QualType LHS, QualType RHS, } bool ASTContext::propertyTypesAreCompatible(QualType LHS, QualType RHS) { - return !mergeTypes(LHS, RHS, false, false).isNull(); + return typesAreCompatible(LHS, RHS); } bool ASTContext::typesAreBlockPointerCompatible(QualType LHS, QualType RHS) { |
