From f916febf5d292fb9e7f2b274276b33156311e2bc Mon Sep 17 00:00:00 2001 From: Manuel Mausz Date: Fri, 17 Feb 2017 13:36:10 +0100 Subject: [PATCH] Fix value_type definition of std::map. (#186) Has to be std::pair --- include/transport/RosterManager.h | 4 ++-- libtransport/RosterManager.cpp | 8 ++++---- spectrum/src/frontends/xmpp/XMPPRosterManager.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/transport/RosterManager.h b/include/transport/RosterManager.h index ba991ea6..b8a8b4e9 100644 --- a/include/transport/RosterManager.h +++ b/include/transport/RosterManager.h @@ -44,7 +44,7 @@ class RosterStorage; /// Manages roster of one XMPP user. class RosterManager { public: - typedef std::map, boost::pool_allocator< std::pair > > BuddiesMap; + typedef std::map, boost::pool_allocator< std::pair > > BuddiesMap; /// Creates new RosterManager. /// \param user User associated with this RosterManager. /// \param component Transport instance associated with this roster. @@ -121,7 +121,7 @@ class RosterManager { void sendUnavailablePresences(const Swift::JID &to); protected: - std::map, boost::pool_allocator< std::pair > > m_buddies; + std::map, boost::pool_allocator< std::pair > > m_buddies; private: Component *m_component; diff --git a/libtransport/RosterManager.cpp b/libtransport/RosterManager.cpp index 8b8388c3..a69a6203 100644 --- a/libtransport/RosterManager.cpp +++ b/libtransport/RosterManager.cpp @@ -59,7 +59,7 @@ RosterManager::~RosterManager() { sendUnavailablePresences(m_user->getJID().toBare()); - for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { + for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { Buddy *buddy = (*it).second; if (!buddy) { continue; @@ -365,7 +365,7 @@ void RosterManager::setStorageBackend(StorageBackend *storageBackend) { Swift::RosterPayload::ref RosterManager::generateRosterPayload() { Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload()); - for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { + for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { Buddy *buddy = (*it).second; if (!buddy) { continue; @@ -381,7 +381,7 @@ Swift::RosterPayload::ref RosterManager::generateRosterPayload() { } void RosterManager::sendCurrentPresences(const Swift::JID &to) { - for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { + for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { Buddy *buddy = (*it).second; if (!buddy) { continue; @@ -416,7 +416,7 @@ void RosterManager::sendCurrentPresence(const Swift::JID &from, const Swift::JID } void RosterManager::sendUnavailablePresences(const Swift::JID &to) { - for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { + for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { Buddy *buddy = (*it).second; if (!buddy) { continue; diff --git a/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp b/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp index 6f39115c..f3ccf309 100644 --- a/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp +++ b/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp @@ -208,7 +208,7 @@ void XMPPRosterManager::handleRemoteRosterResponse(SWIFTEN_SHRPTR_NAMESPACE::sha //If we receive empty RosterPayload on login (not register) initiate full RosterPush if(!m_buddies.empty() && payload->getItems().empty()){ LOG4CXX_INFO(logger, "Received empty Roster upon login. Pushing full Roster."); - for(std::map, boost::pool_allocator< std::pair > >::const_iterator c_it = m_buddies.begin(); + for(std::map, boost::pool_allocator< std::pair > >::const_iterator c_it = m_buddies.begin(); c_it != m_buddies.end(); c_it++) { sendBuddyRosterPush(c_it->second); } @@ -250,7 +250,7 @@ void XMPPRosterManager::sendRIE() { // fallback to normal subscribe if (jidWithRIE.empty()) { - for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { + for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { Buddy *buddy = (*it).second; if (!buddy) { continue; @@ -261,7 +261,7 @@ void XMPPRosterManager::sendRIE() { } Swift::RosterItemExchangePayload::ref payload = Swift::RosterItemExchangePayload::ref(new Swift::RosterItemExchangePayload()); - for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { + for (std::map, boost::pool_allocator< std::pair > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) { Buddy *buddy = (*it).second; if (!buddy) { continue;