REGRESSION(r243115) breaks build for clang 3.8
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Mar 2019 18:02:52 +0000 (18:02 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Mar 2019 18:02:52 +0000 (18:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=195947

Reviewed by Chris Dumez.

* wtf/text/StringConcatenate.h:
(WTF::tryMakeStringFromAdapters):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WTF/ChangeLog
Source/WTF/wtf/text/StringConcatenate.h

index 154e97f..5acff9f 100644 (file)
@@ -1,3 +1,13 @@
+2019-03-20  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        REGRESSION(r243115) breaks build for clang 3.8
+        https://bugs.webkit.org/show_bug.cgi?id=195947
+
+        Reviewed by Chris Dumez.
+
+        * wtf/text/StringConcatenate.h:
+        (WTF::tryMakeStringFromAdapters):
+
 2019-03-20  Tim Horton  <timothy_horton@apple.com>
 
         Add an platform-driven spell-checking mechanism
index c5d0201..1830561 100644 (file)
@@ -278,7 +278,7 @@ String tryMakeStringFromAdapters(StringTypeAdapter adapter, StringTypeAdapters .
 
         makeStringAccumulator(buffer, adapter, adapters...);
 
-        return resultImpl;
+        return String { WTFMove(resultImpl) };
     }
 
     UChar* buffer;
@@ -288,7 +288,7 @@ String tryMakeStringFromAdapters(StringTypeAdapter adapter, StringTypeAdapters .
 
     makeStringAccumulator(buffer, adapter, adapters...);
 
-    return resultImpl;
+    return String { WTFMove(resultImpl) };
 }
 
 template<typename... StringTypes>