diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-04-30 12:48:52 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-05-09 13:58:28 +0200 |
| commit | fda7a716a782f95f89d8b2b980e0b67058d7fec8 (patch) | |
| tree | 2b6aa5e73b30f1ee5f609f494a6bed854b381e35 /desktop/inc | |
| parent | 840e979757d7d9d7104f54269271c617b9b8d473 (diff) | |
std::tuple -> std::pair
Change-Id: I2f11436a5c9691c2a0aac3655bc2c543d1c3d684
Reviewed-on: https://gerrit.libreoffice.org/24566
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 8a6dab5da851f38a8ecef633e06e3cb2ac5e7849)
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/lib/init.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 6206f056987f..66811e40a51c 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; |