commit 40178c352e5b8841df4862490d112c2a1db0b058
author Yaron Keren <yaron.keren@gmail.com> Fri Jul 03 09:30:33 2015 +0000
committer Yaron Keren <yaron.keren@gmail.com> Fri Jul 03 09:30:33 2015 +0000
tree 283af96289a77e749e430c0cd9015b7df65b618f
parent 93834805245d840c4c0f6ca30b486cb491d2b7c2

Revert r241330. It compiled with Visual C++ 2013 and gcc 4.9.1 (mingw) but now fails the bots.

llvm-svn: 241335

clang/lib/ASTMatchers/Dynamic/Parser.cpp

diff --git a/clang/lib/ASTMatchers/Dynamic/Parser.cpp b/clang/lib/ASTMatchers/Dynamic/Parser.cpp
index 96a78cd..9930c53 100644
--- a/clang/lib/ASTMatchers/Dynamic/Parser.cpp
+++ b/clang/lib/ASTMatchers/Dynamic/Parser.cpp
@@ -216,7 +216,7 @@
       if (Code[Length] == Marker) {
         Result->Kind = TokenInfo::TK_Literal;
         Result->Text = Code.substr(0, Length + 1);
-        Result->Value = Code.substr(1, Length - 1);
+        Result->Value = Code.substr(1, Length - 1).str();
         Code = Code.drop_front(Length + 1);
         return;
       }

clang/lib/ASTMatchers/Dynamic/VariantValue.cpp

diff --git a/clang/lib/ASTMatchers/Dynamic/VariantValue.cpp b/clang/lib/ASTMatchers/Dynamic/VariantValue.cpp
index 9d8be47..a88b707 100644
--- a/clang/lib/ASTMatchers/Dynamic/VariantValue.cpp
+++ b/clang/lib/ASTMatchers/Dynamic/VariantValue.cpp
@@ -249,7 +249,7 @@
   setUnsigned(Unsigned);
 }
 
-VariantValue::VariantValue(StringRef String) : Type(VT_Nothing) {
+VariantValue::VariantValue(const std::string &String) : Type(VT_Nothing) {
   setString(String);
 }
 
@@ -319,7 +319,7 @@
   return *Value.String;
 }
 
-void VariantValue::setString(StringRef NewValue) {
+void VariantValue::setString(const std::string &NewValue) {
   reset();
   Type = VT_String;
   Value.String = new std::string(NewValue);