From 3176e97f130184ece0e1a21352c8124cc83ff24a Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 30 Dec 2015 11:49:41 +0000 Subject: Vendor import of clang trunk r256633: https://llvm.org/svn/llvm-project/cfe/trunk@256633 --- include/clang/Lex/Preprocessor.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/clang/Lex/Preprocessor.h') diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h index b2f58ead..f6154b6 100644 --- a/include/clang/Lex/Preprocessor.h +++ b/include/clang/Lex/Preprocessor.h @@ -24,7 +24,6 @@ #include "clang/Lex/ModuleMap.h" #include "clang/Lex/PPCallbacks.h" #include "clang/Lex/PTHLexer.h" -#include "clang/Lex/PTHManager.h" #include "clang/Lex/TokenLexer.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" @@ -57,6 +56,7 @@ class CodeCompletionHandler; class DirectoryLookup; class PreprocessingRecord; class ModuleLoader; +class PTHManager; class PreprocessorOptions; /// \brief Stores token information for comparing actual tokens with @@ -98,6 +98,7 @@ class Preprocessor : public RefCountedBase { DiagnosticsEngine *Diags; LangOptions &LangOpts; const TargetInfo *Target; + const TargetInfo *AuxTarget; FileManager &FileMgr; SourceManager &SourceMgr; std::unique_ptr ScratchBuf; @@ -656,7 +657,10 @@ public: /// /// \param Target is owned by the caller and must remain valid for the /// lifetime of the preprocessor. - void Initialize(const TargetInfo &Target); + /// \param AuxTarget is owned by the caller and must remain valid for + /// the lifetime of the preprocessor. + void Initialize(const TargetInfo &Target, + const TargetInfo *AuxTarget = nullptr); /// \brief Initialize the preprocessor to parse a model file /// @@ -678,6 +682,7 @@ public: const LangOptions &getLangOpts() const { return LangOpts; } const TargetInfo &getTargetInfo() const { return *Target; } + const TargetInfo *getAuxTargetInfo() const { return AuxTarget; } FileManager &getFileManager() const { return FileMgr; } SourceManager &getSourceManager() const { return SourceMgr; } HeaderSearch &getHeaderSearchInfo() const { return HeaderInfo; } -- cgit v1.1