diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 20:52:21 +0000 | 
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-07-25 20:52:21 +0000 | 
| commit | ca757587a3e524e0f58756e8efbea8aff4b020b9 (patch) | |
| tree | f9c6b1b4552b7f21a78acf31f5b150762c5251cb /clang/lib/Basic | |
| parent | ac798e15331cef5990a2aedcdb4be1ffaf395f5a (diff) | |
| download | bcm5719-llvm-ca757587a3e524e0f58756e8efbea8aff4b020b9.tar.gz bcm5719-llvm-ca757587a3e524e0f58756e8efbea8aff4b020b9.zip  | |
Rename SourceManager::getImmediateInstantiationRange to
getImmediateExpansionRange.
llvm-svn: 135960
Diffstat (limited to 'clang/lib/Basic')
| -rw-r--r-- | clang/lib/Basic/SourceManager.cpp | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index aad23ad6db3..30ea39e8a49 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -857,10 +857,10 @@ SourceLocation SourceManager::getImmediateSpellingLoc(SourceLocation Loc) const{  } -/// getImmediateInstantiationRange - Loc is required to be an instantiation +/// getImmediateExpansionRange - Loc is required to be an instantiation  /// location.  Return the start/end of the instantiation information.  std::pair<SourceLocation,SourceLocation> -SourceManager::getImmediateInstantiationRange(SourceLocation Loc) const { +SourceManager::getImmediateExpansionRange(SourceLocation Loc) const {    assert(Loc.isMacroID() && "Not an instantiation loc!");    const InstantiationInfo &II = getSLocEntry(getFileID(Loc)).getInstantiation();    return II.getInstantiationLocRange(); @@ -873,14 +873,14 @@ SourceManager::getExpansionRange(SourceLocation Loc) const {    if (Loc.isFileID()) return std::make_pair(Loc, Loc);    std::pair<SourceLocation,SourceLocation> Res = -    getImmediateInstantiationRange(Loc); +    getImmediateExpansionRange(Loc);    // Fully resolve the start and end locations to their ultimate instantiation    // points.    while (!Res.first.isFileID()) -    Res.first = getImmediateInstantiationRange(Res.first).first; +    Res.first = getImmediateExpansionRange(Res.first).first;    while (!Res.second.isFileID()) -    Res.second = getImmediateInstantiationRange(Res.second).second; +    Res.second = getImmediateExpansionRange(Res.second).second;    return Res;  }  | 

