summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Naganov <mnaganov@google.com>2023-09-14 04:09:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-14 04:09:26 +0000
commit4409223ba53cd778ae1d23412697ceb71c40fa72 (patch)
treeda44e56d2af9afe3fc6371a387238579a23a9d79
parentd5228e012f4b21e2194ecd7ebf7ea9294e759a0b (diff)
parent4da72f2456779297114536672446babbc13a8636 (diff)
downloadlibfmq-4409223ba53cd778ae1d23412697ceb71c40fa72.tar.gz
AidlMessageQueue: Fix order of fields assignment am: 3891d995bb am: 246ebdc80e am: 7f6c09e857 am: b387043fbd am: 4da72f2456
Original change: https://android-review.googlesource.com/c/platform/system/libfmq/+/2751013 Change-Id: Ia658e55bc0b4286db548d8b618b218ca57f4a878 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--include/fmq/AidlMessageQueue.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/fmq/AidlMessageQueue.h b/include/fmq/AidlMessageQueue.h
index 0536d6a..bb56a32 100644
--- a/include/fmq/AidlMessageQueue.h
+++ b/include/fmq/AidlMessageQueue.h
@@ -144,10 +144,10 @@ MQDescriptor<T, U> AidlMessageQueue<T, U>::dupeDesc() {
ints.push_back(shim->handle()->data[data_index]);
}
return MQDescriptor<T, U>{
- .quantum = static_cast<int32_t>(shim->getQuantum()),
.grantors = grantors,
- .flags = static_cast<int32_t>(shim->getFlags()),
.handle = {std::move(fds), std::move(ints)},
+ .quantum = static_cast<int32_t>(shim->getQuantum()),
+ .flags = static_cast<int32_t>(shim->getFlags()),
};
} else {
return MQDescriptor<T, U>();