[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/inc

[Ashod Nakashian]

 desktop/inc/lib/init.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c4a6f2f7bbada7534beeb5211028d03374a532d9
Author: Ashod Nakashian <ashod.nakashian at 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 <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 8a6dab5da851f38a8ecef633e06e3cb2ac5e7849)
    (cherry picked from commit fda7a716a782f95f89d8b2b980e0b67058d7fec8)

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 4c9cc6b..55ae1bc 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;