summaryrefslogtreecommitdiffstats
path: root/compiler-rt
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
commit16c865b0719a098670bed108cf4eef8b067766c4 (patch)
tree096d78520213174d3ccd9740d05430bae14211a0 /compiler-rt
parenta6dd2faaea4ff690d91b83340bebf268959a5423 (diff)
downloadbcm5719-llvm-16c865b0719a098670bed108cf4eef8b067766c4.tar.gz
bcm5719-llvm-16c865b0719a098670bed108cf4eef8b067766c4.zip
[XRay] Fixup: Explicitly call std::make_tuple(...)
Follow-up to D45758. llvm-svn: 333627
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/xray/tests/unit/profile_collector_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/xray/tests/unit/profile_collector_test.cc b/compiler-rt/lib/xray/tests/unit/profile_collector_test.cc
index eb320459b38..5f7d2f8697e 100644
--- a/compiler-rt/lib/xray/tests/unit/profile_collector_test.cc
+++ b/compiler-rt/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) {
OpenPOWER on IntegriCloud