diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-04-03 19:27:57 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-04-03 19:27:57 +0000 |
commit | 6ae7e50be4ad115d06d5c6d361dee1120cc6c73c (patch) | |
tree | 7e160f59bbf995ef28d09663c26bb519eed1fb0d /clang/lib/Sema/Sema.cpp | |
parent | 985a3abee4617eef274d14f50095a44a0dfa0cb8 (diff) | |
download | bcm5719-llvm-6ae7e50be4ad115d06d5c6d361dee1120cc6c73c.tar.gz bcm5719-llvm-6ae7e50be4ad115d06d5c6d361dee1120cc6c73c.zip |
Add 178663 back.
http://lab.llvm.org:8011/builders/clang-x86_64-darwin10-gdb went back green
before it processed the reverted 178663, so it could not have been the culprit.
Revert "Revert 178663."
This reverts commit 4f8a3eb2ce5d4ba422483439e20c8cbb4d953a41.
llvm-svn: 178682
Diffstat (limited to 'clang/lib/Sema/Sema.cpp')
-rw-r--r-- | clang/lib/Sema/Sema.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp index 8b17c123fd1..6bab9e80cbf 100644 --- a/clang/lib/Sema/Sema.cpp +++ b/clang/lib/Sema/Sema.cpp @@ -728,7 +728,7 @@ void Sema::ActOnEndOfTranslationUnit() { Diag(DiagD->getLocation(), diag::warn_unneeded_member_function) << DiagD->getDeclName(); else { - if (FD->getStorageClassAsWritten() == SC_Static && + if (FD->getStorageClass() == SC_Static && !FD->isInlineSpecified() && !SourceMgr.isFromMainFile( SourceMgr.getExpansionLoc(FD->getLocation()))) |