diff options
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/inc/pch/precompiled_slideshow.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx | 5 |
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, |