diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-12-10 20:08:37 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-12-10 20:08:37 +0000 |
| commit | 0d355df239453865c63202939ffc5adace58a7f8 (patch) | |
| tree | c603c6eba47a27e7cba7fe3f761200ef2d8959cd /clang/lib/Lex/HeaderSearch.cpp | |
| parent | 5d6faed1f093b264a90e315eb890f898d26b174b (diff) | |
| download | bcm5719-llvm-0d355df239453865c63202939ffc5adace58a7f8.tar.gz bcm5719-llvm-0d355df239453865c63202939ffc5adace58a7f8.zip | |
Return true from HeaderSearch::isFileMultipleIncludeGuarded if the file
was #import'ed.
llvm-svn: 169761
Diffstat (limited to 'clang/lib/Lex/HeaderSearch.cpp')
| -rw-r--r-- | clang/lib/Lex/HeaderSearch.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index 50199e0f01b..cb68eb07e6d 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -749,7 +749,8 @@ bool HeaderSearch::isFileMultipleIncludeGuarded(const FileEntry *File) { if (ExternalSource && !HFI.Resolved) mergeHeaderFileInfo(HFI, ExternalSource->GetHeaderFileInfo(File)); - return HFI.isPragmaOnce || HFI.ControllingMacro || HFI.ControllingMacroID; + return HFI.isPragmaOnce || HFI.isImport || + HFI.ControllingMacro || HFI.ControllingMacroID; } void HeaderSearch::setHeaderFileInfoForUID(HeaderFileInfo HFI, unsigned UID) { |
