summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-31 12:28:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-31 17:25:52 +0000
commit1fd280f2c63cdf8d24b48c02fe384f0bc20682c1 (patch)
tree35b84f9730d7a6def967869336cc437e94ca6439 /slideshow
parentde368b7783dff197ae279e0720c61efb2e0ff274 (diff)
boost::tuple -> std::tuple
Change-Id: Ia08c184b792ff73d3ed49d6a5d54dec1a35943e9 Reviewed-on: https://gerrit.libreoffice.org/21955 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/inc/pch/precompiled_slideshow.hxx2
-rw-r--r--slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx5
2 files changed, 3 insertions, 4 deletions
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index 8d36b9675164..19356d905de5 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -50,6 +50,7 @@
#include <string.h>
#include <string>
#include <type_traits>
+#include <tuple>
#include <typeinfo>
#include <utility>
#include <vector>
@@ -61,7 +62,6 @@
#include <boost/optional.hpp>
#include <boost/shared_array.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/tuple/tuple.hpp>
#include <boost/weak_ptr.hpp>
#include <osl/diagnose.h>
#include <osl/diagnose.hxx>
diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
index c065b5e11c84..045de8a1852b 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
@@ -22,10 +22,9 @@
#include <continuouskeytimeactivitybase.hxx>
-#include <boost/tuple/tuple.hpp>
#include <algorithm>
#include <iterator>
-
+#include <tuple>
namespace slideshow
{
@@ -52,7 +51,7 @@ namespace slideshow
double fAlpha( calcAcceleratedTime( nSimpleTime ) );
std::ptrdiff_t nIndex;
- boost::tuples::tie(nIndex,fAlpha) = maLerper.lerp(fAlpha);
+ std::tie(nIndex,fAlpha) = maLerper.lerp(fAlpha);
perform(
nIndex,