[clang-tools-extra] r185814 - cpp11-migrate: Fixes for r185811

[Edwin Vane]

Author: revane
Date: Mon Jul  8 07:49:04 2013
New Revision: 185814

URL: http://llvm.org/viewvc/llvm-project?rev=185814&view=rev
Log:
cpp11-migrate: Fixes for r185811

Some changes to r185811 broke certain build configurations. These changes should
fix them.

Author: Guillaume Papin <guillaume.papin at epitech.eu>


Modified:
    clang-tools-extra/trunk/cpp11-migrate/Core/FileOverrides.h
    clang-tools-extra/trunk/cpp11-migrate/Core/Transform.cpp

Modified: clang-tools-extra/trunk/cpp11-migrate/Core/FileOverrides.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/cpp11-migrate/Core/FileOverrides.h?rev=185814&r1=185813&r2=185814&view=diff
==============================================================================
--- clang-tools-extra/trunk/cpp11-migrate/Core/FileOverrides.h (original)
+++ clang-tools-extra/trunk/cpp11-migrate/Core/FileOverrides.h Mon Jul  8 07:49:04 2013
@@ -41,7 +41,7 @@ typedef std::map<std::string, HeaderOver
 
 /// \brief Container storing the file content overrides for a source file.
 struct SourceOverrides {
-  SourceOverrides(llvm::StringRef MainFileName)
+  SourceOverrides(const std::string &MainFileName)
       : MainFileName(MainFileName) {}
 
   /// \brief Convenience function for applying this source's overrides to

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=185814&r1=185813&r2=185814&view=diff
==============================================================================
--- clang-tools-extra/trunk/cpp11-migrate/Core/Transform.cpp (original)
+++ clang-tools-extra/trunk/cpp11-migrate/Core/Transform.cpp Mon Jul  8 07:49:04 2013
@@ -216,7 +216,8 @@ void Transform::handleEndSource() {
 
     FileOverrides::iterator I = Overrides->find(CurrentSource);
     if (I == Overrides->end())
-      I = Overrides->insert(std::make_pair(CurrentSource, CurrentSource)).first;
+      I = Overrides->insert(FileOverrides::value_type(CurrentSource,
+                                                      CurrentSource)).first;
 
     collectResults(RewriterOwner->getRewriter(), I->second);
   }