diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2009-11-14 16:36:57 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2009-11-14 16:36:57 +0000 |
| commit | c997eb4ac1b332406b1f16d4eddce7988d68c56b (patch) | |
| tree | 56f7b57a212dbdb5330cb565c890d46d02a6622c | |
| parent | c7a05bdff8c52990d0987ceefad33166fe2fd2cc (diff) | |
Move DISABLE_INLINE to the front of the decl so MSVC can parse it. Patch by Amine Khaldi!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@88797 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Basic/SourceManager.cpp | 4 | ||||
| -rw-r--r-- | lib/Lex/Lexer.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index 962cb4c42a..a85bef0f29 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -715,8 +715,8 @@ unsigned SourceManager::getInstantiationColumnNumber(SourceLocation Loc) const { -static void ComputeLineNumbers(ContentCache* FI, - llvm::BumpPtrAllocator &Alloc) DISABLE_INLINE; +static DISABLE_INLINE void ComputeLineNumbers(ContentCache* FI, + llvm::BumpPtrAllocator &Alloc); static void ComputeLineNumbers(ContentCache* FI, llvm::BumpPtrAllocator &Alloc){ // Note that calling 'getBuffer()' may lazily page in the file. const MemoryBuffer *Buffer = FI->getBuffer(); diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index c8b9a5d542..f4a4432410 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -384,10 +384,10 @@ static inline bool isNumberBody(unsigned char c) { /// lexer buffer was all instantiated at a single point, perform the mapping. /// This is currently only used for _Pragma implementation, so it is the slow /// path of the hot getSourceLocation method. Do not allow it to be inlined. -static SourceLocation GetMappedTokenLoc(Preprocessor &PP, - SourceLocation FileLoc, - unsigned CharNo, - unsigned TokLen) DISABLE_INLINE; +static DISABLE_INLINE SourceLocation GetMappedTokenLoc(Preprocessor &PP, + SourceLocation FileLoc, + unsigned CharNo, + unsigned TokLen); static SourceLocation GetMappedTokenLoc(Preprocessor &PP, SourceLocation FileLoc, unsigned CharNo, unsigned TokLen) { |