diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 16:49:02 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 16:49:02 +0000 |
| commit | 35f5320d8e3bd080bd6316ef13716adf011d89e9 (patch) | |
| tree | a2d1d3609f6570fff401687602ba90163047ef8a /clang/lib/Basic | |
| parent | 163d675e727086abf65c91f6c898e672ca72ebfe (diff) | |
| download | bcm5719-llvm-35f5320d8e3bd080bd6316ef13716adf011d89e9.tar.gz bcm5719-llvm-35f5320d8e3bd080bd6316ef13716adf011d89e9.zip | |
Mechanically rename SourceManager::getInstantiationLoc and
FullSourceLoc::getInstantiationLoc to ...::getExpansionLoc. This is part
of the API and documentation update from 'instantiation' as the term for
macros to 'expansion'.
llvm-svn: 135914
Diffstat (limited to 'clang/lib/Basic')
| -rw-r--r-- | clang/lib/Basic/DiagnosticIDs.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Basic/SourceLocation.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Basic/DiagnosticIDs.cpp b/clang/lib/Basic/DiagnosticIDs.cpp index 19f627e8041..08e4420c410 100644 --- a/clang/lib/Basic/DiagnosticIDs.cpp +++ b/clang/lib/Basic/DiagnosticIDs.cpp @@ -540,7 +540,7 @@ DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, unsigned DiagClass, Diag.SuppressSystemWarnings && Loc.isValid() && Diag.getSourceManager().isInSystemHeader( - Diag.getSourceManager().getInstantiationLoc(Loc))) + Diag.getSourceManager().getExpansionLoc(Loc))) return DiagnosticIDs::Ignored; return Result; diff --git a/clang/lib/Basic/SourceLocation.cpp b/clang/lib/Basic/SourceLocation.cpp index cf89edb935c..84f03fb3509 100644 --- a/clang/lib/Basic/SourceLocation.cpp +++ b/clang/lib/Basic/SourceLocation.cpp @@ -54,7 +54,7 @@ void SourceLocation::print(raw_ostream &OS, const SourceManager &SM)const{ return; } - SM.getInstantiationLoc(*this).print(OS, SM); + SM.getExpansionLoc(*this).print(OS, SM); OS << " <Spelling="; SM.getSpellingLoc(*this).print(OS, SM); @@ -75,9 +75,9 @@ FileID FullSourceLoc::getFileID() const { } -FullSourceLoc FullSourceLoc::getInstantiationLoc() const { +FullSourceLoc FullSourceLoc::getExpansionLoc() const { assert(isValid()); - return FullSourceLoc(SrcMgr->getInstantiationLoc(*this), *SrcMgr); + return FullSourceLoc(SrcMgr->getExpansionLoc(*this), *SrcMgr); } FullSourceLoc FullSourceLoc::getSpellingLoc() const { |
