desktop/inc/lib/init.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 8a6dab5da851f38a8ecef633e06e3cb2ac5e7849 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> Date: Sat Apr 30 12:48:52 2016 -0400 std::tuple -> std::pair Change-Id: I2f11436a5c9691c2a0aac3655bc2c543d1c3d684 Reviewed-on: https://gerrit.libreoffice.org/24566 Reviewed-by: Ashod Nakashian <ashnak...@gmail.com> Tested-by: Ashod Nakashian <ashnak...@gmail.com> diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 8ef92b1..6c475ac 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -94,7 +94,7 @@ namespace desktop { } if (type == LOK_CALLBACK_INVALIDATE_TILES && - !m_queue.empty() && std::get<0>(m_queue.back()) == type && std::get<1>(m_queue.back()) == payload) + !m_queue.empty() && m_queue.back().first == type && m_queue.back().second == payload) { // Supress duplicate invalidation only when they are in sequence. return; @@ -124,7 +124,7 @@ namespace desktop { std::unique_lock<std::mutex> lock(m_mutex); for (auto& pair : m_queue) { - m_pCallback(std::get<0>(pair), std::get<1>(pair).c_str(), m_pData); + m_pCallback(pair.first, pair.second.c_str(), m_pData); } m_queue.clear(); @@ -132,7 +132,7 @@ namespace desktop { } private: - std::vector<std::tuple<int, std::string>> m_queue; + std::vector<std::pair<int, std::string>> m_queue; std::map<int, std::string> m_states; LibreOfficeKitCallback m_pCallback; void *m_pData; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits