diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-01-10 00:24:58 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-01-10 00:24:58 +0000 |
| commit | 804f65271953f358dc01bfcf74a93e8c93c5b2d6 (patch) | |
| tree | 80aa6b0d905fa5776b57e218456b729d0bfd8532 /include/clang | |
| parent | 4a749b957f28292e8412b7c13b01ca4baeb78d24 (diff) | |
implement rdar://7520940: published framework headers should
import other headers within the same framework with the full
framework path, not with a relative include.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@93083 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang')
| -rw-r--r-- | include/clang/Basic/DiagnosticLexKinds.td | 3 | ||||
| -rw-r--r-- | include/clang/Lex/Preprocessor.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td index d8b5f2dad3..d79091a1f6 100644 --- a/include/clang/Basic/DiagnosticLexKinds.td +++ b/include/clang/Basic/DiagnosticLexKinds.td @@ -169,6 +169,9 @@ def err_pp_hash_error : Error<"#error%0">; def err_pp_file_not_found : Error<"'%0' file not found">, DefaultFatal; def err_pp_error_opening_file : Error< "error opening file '%0': %1">, DefaultFatal; +def warn_pp_relative_include_from_framework : Warning< + "published framework headers should always #import headers within the " + "framework with framework paths">, InGroup<DiagGroup<"framework-headers">>; def err_pp_empty_filename : Error<"empty filename">; def err_pp_include_too_deep : Error<"#include nested too deeply">; def err_pp_expects_filename : Error<"expected \"FILENAME\" or <FILENAME>">; diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h index a73d829f9e..5669a63207 100644 --- a/include/clang/Lex/Preprocessor.h +++ b/include/clang/Lex/Preprocessor.h @@ -698,7 +698,8 @@ public: /// return null on failure. isAngled indicates whether the file reference is /// for system #include's or not (i.e. using <> instead of ""). const FileEntry *LookupFile(const char *FilenameStart,const char *FilenameEnd, - bool isAngled, const DirectoryLookup *FromDir, + SourceLocation FilenameTokLoc, bool isAngled, + const DirectoryLookup *FromDir, const DirectoryLookup *&CurDir); /// GetCurLookup - The DirectoryLookup structure used to find the current |