[clang-tools-extra] r188970 - Adjust for r188968.

[Eli Friedman]

Author: efriedma
Date: Wed Aug 21 19:48:18 2013
New Revision: 188970

URL: http://llvm.org/viewvc/llvm-project?rev=188970&view=rev
Log:
Adjust for r188968.

Modified:
    clang-tools-extra/trunk/cpp11-migrate/Core/Transform.cpp
    clang-tools-extra/trunk/cpp11-migrate/UseNullptr/NullptrActions.cpp

Modified: clang-tools-extra/trunk/cpp11-migrate/Core/Transform.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/cpp11-migrate/Core/Transform.cpp?rev=188970&r1=188969&r2=188970&view=diff
==============================================================================
--- clang-tools-extra/trunk/cpp11-migrate/Core/Transform.cpp (original)
+++ clang-tools-extra/trunk/cpp11-migrate/Core/Transform.cpp Wed Aug 21 19:48:18 2013
@@ -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)

Modified: clang-tools-extra/trunk/cpp11-migrate/UseNullptr/NullptrActions.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/cpp11-migrate/UseNullptr/NullptrActions.cpp?rev=188970&r1=188969&r2=188970&view=diff
==============================================================================
--- clang-tools-extra/trunk/cpp11-migrate/UseNullptr/NullptrActions.cpp (original)
+++ clang-tools-extra/trunk/cpp11-migrate/UseNullptr/NullptrActions.cpp Wed Aug 21 19:48:18 2013
@@ -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);
 }