summaryrefslogtreecommitdiff
path: root/lib/xray
diff options
context:
space:
mode:
authorDean Michael Berris <dberris@google.com>2018-05-31 05:02:11 +0000
committerDean Michael Berris <dberris@google.com>2018-05-31 05:02:11 +0000
commita48134c8eeb079b91b15e43b8cecfce5119b4a8a (patch)
treec341e9f727e9ac1302e5c94c499431825df87d75 /lib/xray
parentcb693c0d2bc4115c3593c3af6889448d65e67ae8 (diff)
[XRay] Fixup: Explicitly call std::make_tuple(...)
Follow-up to D45758. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333627 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/xray')
-rw-r--r--lib/xray/tests/unit/profile_collector_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/xray/tests/unit/profile_collector_test.cc b/lib/xray/tests/unit/profile_collector_test.cc
index eb320459b..5f7d2f869 100644
--- a/lib/xray/tests/unit/profile_collector_test.cc
+++ b/lib/xray/tests/unit/profile_collector_test.cc
@@ -54,7 +54,7 @@ std::tuple<u32, u32, u64> ParseBlockHeader(XRayBuffer B) {
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 *> ParseProfile(const char *P) {
// 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) {