From 5b49224c12a8df93f7fb6018b04add5d6af8c1b0 Mon Sep 17 00:00:00 2001
From: Joseph Donofry <joedonofry@gmail.com>
Date: Wed, 6 May 2020 20:57:46 -0400
Subject: [PATCH] Fix shadowed variables
---
lib/structs/responses/sync.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/structs/responses/sync.cpp b/lib/structs/responses/sync.cpp
index accd24ecf..3bf7e6329 100644
--- a/lib/structs/responses/sync.cpp
+++ b/lib/structs/responses/sync.cpp
@@ -131,11 +131,11 @@ InvitedRoom::name() const
std::string member_name;
for (const auto &event : invite_state) {
- if (auto e = std::get_if<Name>(&event); e != nullptr) {
- room_name = e->content.name;
- } else if (auto e = std::get_if<Member>(&event); e != nullptr) {
+ if (auto name = std::get_if<Name>(&event); name != nullptr) {
+ room_name = name->content.name;
+ } else if (auto avatar = std::get_if<Member>(&event); avatar != nullptr) {
if (member_name.empty())
- member_name = e->content.display_name;
+ member_name = avatar->content.display_name;
}
}
@@ -155,12 +155,12 @@ InvitedRoom::avatar() const
std::string member_avatar;
for (const auto &event : invite_state) {
- if (auto e = std::get_if<Avatar>(&event); e != nullptr) {
- room_avatar = e->content.url;
- } else if (auto e = std::get_if<Member>(&event); e != nullptr) {
+ if (auto avatar = std::get_if<Avatar>(&event); avatar != nullptr) {
+ room_avatar = avatar->content.url;
+ } else if (auto member = std::get_if<Member>(&event); member != nullptr) {
// Pick the first avatar.
if (member_avatar.empty())
- member_avatar = e->content.avatar_url;
+ member_avatar = member->content.avatar_url;
}
}
--
GitLab