From 22b80ac8e213ff63ce4f60e7d491f12cb42db313 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 14 Sep 2015 09:21:33 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c Reviewed-on: https://gerrit.libreoffice.org/18564 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- canvas/source/tools/elapsedtime.cxx | 2 +- canvas/source/tools/page.hxx | 6 +++--- canvas/source/tools/pagemanager.hxx | 2 +- canvas/source/tools/surface.hxx | 2 +- canvas/source/tools/surfaceproxy.hxx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'canvas/source/tools') diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index 4fa647732bdd..8922f5ca055d 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -123,7 +123,7 @@ ElapsedTime::ElapsedTime() } ElapsedTime::ElapsedTime( - boost::shared_ptr const & pTimeBase ) + std::shared_ptr const & pTimeBase ) : m_pTimeBase( pTimeBase ), m_fLastQueriedTime( 0.0 ), m_fStartTime( getCurrentTime() ), diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx index 75ef54402be1..c456a2983570 100644 --- a/canvas/source/tools/page.hxx +++ b/canvas/source/tools/page.hxx @@ -27,15 +27,15 @@ #include #include +#include #include -#include #include "surfacerect.hxx" namespace canvas { class PageFragment; - typedef ::boost::shared_ptr< PageFragment > FragmentSharedPtr; + typedef std::shared_ptr< PageFragment > FragmentSharedPtr; /** One page of IRenderModule-provided texture space */ @@ -62,7 +62,7 @@ namespace canvas bool isValidLocation( const SurfaceRect& r ) const; }; - typedef ::boost::shared_ptr< Page > PageSharedPtr; + typedef std::shared_ptr< Page > PageSharedPtr; /** A part of a page, which gets allocated to a surface diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx index 632d4d6bae6c..9161fe438406 100644 --- a/canvas/source/tools/pagemanager.hxx +++ b/canvas/source/tools/pagemanager.hxx @@ -72,7 +72,7 @@ namespace canvas // PageManagerSharedPtr - typedef ::boost::shared_ptr< PageManager > PageManagerSharedPtr; + typedef std::shared_ptr< PageManager > PageManagerSharedPtr; } #endif diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx index 33186c11ce17..d6b8d90995e0 100644 --- a/canvas/source/tools/surface.hxx +++ b/canvas/source/tools/surface.hxx @@ -142,7 +142,7 @@ namespace canvas const ::basegfx::B2ISize& rSize ) const; }; - typedef ::boost::shared_ptr< Surface > SurfaceSharedPtr; + typedef std::shared_ptr< Surface > SurfaceSharedPtr; } #endif diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx index 3eb7019e0f27..56f4ac7a926b 100644 --- a/canvas/source/tools/surfaceproxy.hxx +++ b/canvas/source/tools/surfaceproxy.hxx @@ -115,7 +115,7 @@ namespace canvas canvas::IColorBufferSharedPtr mpBuffer; }; - typedef ::boost::shared_ptr< SurfaceProxy > SurfaceProxySharedPtr; + typedef std::shared_ptr< SurfaceProxy > SurfaceProxySharedPtr; } #endif -- cgit