Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-28 16:17:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename RS mail tracker id type according to Cyril suggestion

Browse source
This commit is contained in:
Gioacchino Mazzurco 2019-10-26 15:21:21 +02:00
parent e530616c53
commit 9a8248c1a2
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
5 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/rsserver/p3msgs.cc
View file

@ -309,7 +309,7 @@ uint32_t p3Msgs::sendMail(
const std::set<RsGxsId>& cc,
const std::set<RsGxsId>& bcc,
const std::vector<FileInfo>& attachments,
std::set<RsMailTrackId>& trackingIds,
std::set<RsMailIdRecipientIdPair>& trackingIds,
std::string& errorMsg )
{
return mMsgSrv->sendMail(
@ -564,7 +564,7 @@ Rs::Msgs::MessageInfo::~MessageInfo() = default;
MsgInfoSummary::~MsgInfoSummary() = default;
VisibleChatLobbyRecord::~VisibleChatLobbyRecord() = default;
void RsMailTrackId::serial_process(
void RsMailIdRecipientIdPair::serial_process(
RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx )
{
@ -572,13 +572,13 @@ void RsMailTrackId::serial_process(
RS_SERIAL_PROCESS(mRecipientId);
}
bool RsMailTrackId::operator<(const RsMailTrackId& o) const
bool RsMailIdRecipientIdPair::operator<(const RsMailIdRecipientIdPair& o) const
{
return std::tie( mMailId, mRecipientId) <
std::tie(o.mMailId, o.mRecipientId);
}
bool RsMailTrackId::operator==(const RsMailTrackId& o) const
bool RsMailIdRecipientIdPair::operator==(const RsMailIdRecipientIdPair& o) const
{
return std::tie( mMailId, mRecipientId) ==
std::tie(o.mMailId, o.mRecipientId);

4
libretroshare/src/rsserver/p3msgs.h
View file

@ -53,8 +53,8 @@ public:
const std::set<RsGxsId>& cc = std::set<RsGxsId>(),
const std::set<RsGxsId>& bcc = std::set<RsGxsId>(),
const std::vector<FileInfo>& attachments = std::vector<FileInfo>(),
std::set<RsMailTrackId>& trackingIds =
RS_DEFAULT_STORAGE_PARAM(std::set<RsMailTrackId>),
std::set<RsMailIdRecipientIdPair>& trackingIds =
RS_DEFAULT_STORAGE_PARAM(std::set<RsMailIdRecipientIdPair>),
std::string& errorMsg =
RS_DEFAULT_STORAGE_PARAM(std::string) ) override;