Fix clang error using implicit tuples ctors with an old stdlibc++ ver…

…sion
aseprite · Mar 11, 2020 · b607b32 · b607b32
1 parent 0b6e2af
commit b607b32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/gpu/GrProcessorUnitTest.cpp b/src/gpu/GrProcessorUnitTest.cpp
@@ -46,7 +46,7 @@ GrProcessorTestData::ProxyInfo GrProcessorTestData::randomAlphaOnlyProxy() {
     int idx = fRandom->nextULessThan(numAlphaOnly);
     for (const auto& [p, ct, at] : fProxies) {
         if (GrColorTypeIsAlphaOnly(ct) && !idx--) {
-            return {p, ct, at};
+            return std::make_tuple(p, ct, at);
         }
     }
     SkUNREACHABLE;

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
@@ -830,7 +830,7 @@ std::tuple<bool, int> GrTextBlob::VertexRegenerator::updateTextureCoordinatesMay
                           : fFullAtlasManager->atlasGeneration(fSubRun->maskFormat());
     }
 
-    return {code != GrDrawOpAtlas::ErrorCode::kError, glyphsPlacedInAtlas};
+    return std::make_tuple(code != GrDrawOpAtlas::ErrorCode::kError, glyphsPlacedInAtlas);
 }
 
 std::tuple<bool, int> GrTextBlob::VertexRegenerator::regenerate(int begin, int end) {
@@ -853,6 +853,6 @@ std::tuple<bool, int> GrTextBlob::VertexRegenerator::regenerate(int begin, int e
                                                fUploadTarget->tokenTracker()->nextDrawToken(),
                                                fSubRun->maskFormat());
         }
-        return {true, end - begin};
+        return std::make_tuple(true, end - begin);
     }
 }