maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Trying to fix name conflict in change-namespace tool. 

llvm-svn: 281920
This commit is contained in:
Eric Liu 2016-09-19 17:58:59 +00:00
parent ecbb0bb169
commit cc83c66ee9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang-tools-extra/change-namespace/ChangeNamespace.cpp
View File

@ -327,8 +327,8 @@ void ChangeNamespaceTool::moveOldNamespace(
MoveNs.InsertionOffset = Result.SourceManager->getFileOffset(
Result.SourceManager->getSpellingLoc(LocAfterNs));
MoveNs.FileID = Result.SourceManager->getFileID(Start);
MoveNs.SourceManager = Result.SourceManager;
MoveNs.FID = Result.SourceManager->getFileID(Start);
MoveNs.SourceMgr = Result.SourceManager;
MoveNamespaces[R.getFilePath()].push_back(MoveNs);
}
@ -447,8 +447,8 @@ void ChangeNamespaceTool::onEndOfTranslationUnit() {
continue;
const std::string &FilePath = FileAndNsMoves.first;
auto &Replaces = FileToReplacements[FilePath];
auto &SM = *NsMoves.begin()->SourceManager;
llvm::StringRef Code = SM.getBufferData(NsMoves.begin()->FileID);
auto &SM = *NsMoves.begin()->SourceMgr;
llvm::StringRef Code = SM.getBufferData(NsMoves.begin()->FID);
auto ChangedCode = tooling::applyAllReplacements(Code, Replaces);
if (!ChangedCode) {
llvm::errs() << llvm::toString(ChangedCode.takeError()) << "\n";

4
clang-tools-extra/change-namespace/ChangeNamespace.h
View File

@ -84,8 +84,8 @@ private:
// original code.
unsigned InsertionOffset;
// The file in which the namespace is declared.
FileID FileID;
SourceManager *SourceManager;
FileID FID;
SourceManager *SourceMgr;
};
// Information about inserting a class forward declaration.