diff options
author | Chris Lattner <sabre@nondot.org> | 2011-07-23 17:14:25 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2011-07-23 17:14:25 +0000 |
commit | 2d3ba4f5a923a90c3fc290ddfba5e36c2d0a9b46 (patch) | |
tree | 3b65b8898ac2f33b825765d8519f7329d2b556ec /include | |
parent | 1c3199afb8aeab5f4dfcef60999d13d9c6877a67 (diff) |
Move ArrayRef to LLVM.h and eliminate now-redundant qualifiers, patch by Jon Mulder!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135855 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/clang/Basic/Diagnostic.h | 4 | ||||
-rw-r--r-- | include/clang/Basic/LLVM.h | 4 | ||||
-rw-r--r-- | include/clang/Driver/Driver.h | 4 | ||||
-rw-r--r-- | include/clang/Frontend/Utils.h | 2 | ||||
-rw-r--r-- | include/clang/Lex/Preprocessor.h | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h index 7f6f53739c..b7a1f3a627 100644 --- a/include/clang/Basic/Diagnostic.h +++ b/include/clang/Basic/Diagnostic.h @@ -987,8 +987,8 @@ public: StringRef Message); StoredDiagnostic(Diagnostic::Level Level, unsigned ID, StringRef Message, FullSourceLoc Loc, - llvm::ArrayRef<CharSourceRange> Ranges, - llvm::ArrayRef<FixItHint> Fixits); + ArrayRef<CharSourceRange> Ranges, + ArrayRef<FixItHint> Fixits); ~StoredDiagnostic(); /// \brief Evaluates true when this object stores a diagnostic. diff --git a/include/clang/Basic/LLVM.h b/include/clang/Basic/LLVM.h index 7db17f7659..27c459dee4 100644 --- a/include/clang/Basic/LLVM.h +++ b/include/clang/Basic/LLVM.h @@ -23,11 +23,12 @@ namespace llvm { // ADT's. class StringRef; class Twine; + template<typename T> class ArrayRef; template<typename T, unsigned N> class SmallVector; template<typename T> class SmallVectorImpl; class raw_ostream; - // TODO: ArrayRef, DenseMap, ... + // TODO: DenseMap, ... } @@ -42,6 +43,7 @@ namespace clang { // ADT's. using llvm::StringRef; using llvm::Twine; + using llvm::ArrayRef; using llvm::SmallVector; using llvm::SmallVectorImpl; diff --git a/include/clang/Driver/Driver.h b/include/clang/Driver/Driver.h index 1af572a5bd..3ad3fb3ff4 100644 --- a/include/clang/Driver/Driver.h +++ b/include/clang/Driver/Driver.h @@ -223,14 +223,14 @@ public: /// argument vector. A null return value does not necessarily /// indicate an error condition, the diagnostics should be queried /// to determine if an error occurred. - Compilation *BuildCompilation(llvm::ArrayRef<const char *> Args); + Compilation *BuildCompilation(ArrayRef<const char *> Args); /// @name Driver Steps /// @{ /// ParseArgStrings - Parse the given list of strings into an /// ArgList. - InputArgList *ParseArgStrings(llvm::ArrayRef<const char *> Args); + InputArgList *ParseArgStrings(ArrayRef<const char *> Args); /// BuildActions - Construct the list of actions to perform for the /// given arguments, which are only done for a single architecture. diff --git a/include/clang/Frontend/Utils.h b/include/clang/Frontend/Utils.h index 105e4eb0de..b3ecb363ba 100644 --- a/include/clang/Frontend/Utils.h +++ b/include/clang/Frontend/Utils.h @@ -100,7 +100,7 @@ void CacheTokens(Preprocessor &PP, llvm::raw_fd_ostream* OS); /// \return A CompilerInvocation, or 0 if none was built for the given /// argument vector. CompilerInvocation * -createInvocationFromCommandLine(llvm::ArrayRef<const char *> Args, +createInvocationFromCommandLine(ArrayRef<const char *> Args, llvm::IntrusiveRefCntPtr<Diagnostic> Diags = llvm::IntrusiveRefCntPtr<Diagnostic>()); diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h index e546b69370..2a2f099548 100644 --- a/include/clang/Lex/Preprocessor.h +++ b/include/clang/Lex/Preprocessor.h @@ -1006,7 +1006,7 @@ private: /// going to lex in the cache and when it finishes the tokens are removed /// from the end of the cache. Token *cacheMacroExpandedTokens(TokenLexer *tokLexer, - llvm::ArrayRef<Token> tokens); + ArrayRef<Token> tokens); void removeCachedMacroExpandedTokensOfLastLexer(); friend void TokenLexer::ExpandFunctionArguments(); |