diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2013-08-22 00:48:18 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2013-08-22 00:48:18 +0000 |
commit | a4ff59a7f81f2610b1716318be0a5f5213e684eb (patch) | |
tree | 1632dc3b20badd7393c6522e40cff94782104d42 /clang-tools-extra/cpp11-migrate | |
parent | 4cda461ec48cf21b198fff940a0d9c65df8e3cc1 (diff) | |
download | bcm5719-llvm-a4ff59a7f81f2610b1716318be0a5f5213e684eb.tar.gz bcm5719-llvm-a4ff59a7f81f2610b1716318be0a5f5213e684eb.zip |
Adjust for r188968.
llvm-svn: 188970
Diffstat (limited to 'clang-tools-extra/cpp11-migrate')
-rw-r--r-- | clang-tools-extra/cpp11-migrate/Core/Transform.cpp | 2 | ||||
-rw-r--r-- | clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang-tools-extra/cpp11-migrate/Core/Transform.cpp b/clang-tools-extra/cpp11-migrate/Core/Transform.cpp index 92520638502..4354df2987e 100644 --- a/clang-tools-extra/cpp11-migrate/Core/Transform.cpp +++ b/clang-tools-extra/cpp11-migrate/Core/Transform.cpp @@ -84,7 +84,7 @@ Transform::~Transform() {} bool Transform::isFileModifiable(const SourceManager &SM, const SourceLocation &Loc) const { - if (SM.isFromMainFile(Loc)) + if (SM.isWrittenInMainFile(Loc)) return true; if (!GlobalOptions.EnableHeaderModifications) diff --git a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.cpp b/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.cpp index 30c36d75272..e170801a034 100644 --- a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.cpp +++ b/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.cpp @@ -40,7 +40,7 @@ UserNullMacroNames("user-null-macros", bool isReplaceableRange(SourceLocation StartLoc, SourceLocation EndLoc, const SourceManager &SM, const Transform &Owner) { - return SM.isFromSameFile(StartLoc, EndLoc) && + return SM.isWrittenInSameFile(StartLoc, EndLoc) && Owner.isFileModifiable(SM, StartLoc); } |