[compiler-rt] r333627 - [XRay] Fixup: Explicitly call std::make_tuple(...)

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Wed May 30 22:02:11 2018
New Revision: 333627

URL: http://llvm.org/viewvc/llvm-project?rev=333627&view=rev
Log:
[XRay] Fixup: Explicitly call std::make_tuple(...)

Follow-up to D45758.

Modified:
    compiler-rt/trunk/lib/xray/tests/unit/profile_collector_test.cc

Modified: compiler-rt/trunk/lib/xray/tests/unit/profile_collector_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/tests/unit/profile_collector_test.cc?rev=333627&r1=333626&r2=333627&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/tests/unit/profile_collector_test.cc (original)
+++ compiler-rt/trunk/lib/xray/tests/unit/profile_collector_test.cc Wed May 30 22:02:11 2018
@@ -54,7 +54,7 @@ std::tuple<u32, u32, u64> ParseBlockHead
   internal_memcpy(&BlockSize, LocalBuffer, sizeof(u32));
   internal_memcpy(&BlockNumber, LocalBuffer + sizeof(u32), sizeof(u32));
   internal_memcpy(&ThreadId, LocalBuffer + (2 * sizeof(u32)), sizeof(u64));
-  return {BlockSize, BlockNumber, ThreadId};
+  return std::make_tuple(BlockSize, BlockNumber, ThreadId);
 }
 
 struct Profile {
@@ -80,7 +80,7 @@ std::tuple<Profile, const char *> ParseP
   // Then read the CumulativeLocalTime.
   internal_memcpy(&Result.CumulativeLocalTime, P, sizeof(int64_t));
   P += sizeof(int64_t);
-  return {std::move(Result), P};
+  return std::make_tuple(std::move(Result), P);
 }
 
 TEST(profileCollectorServiceTest, PostSerializeCollect) {