diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 09:21:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 12:54:25 +0000 |
| commit | 22b80ac8e213ff63ce4f60e7d491f12cb42db313 (patch) | |
| tree | b00f1ed362747a05d79686a8709c3408cfdee59b /canvas/source/tools | |
| parent | d8026ad65c8d50868f0f2fc0d2bd95820cddea83 (diff) | |
boost->std
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c
Reviewed-on: https://gerrit.libreoffice.org/18564
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'canvas/source/tools')
| -rw-r--r-- | canvas/source/tools/elapsedtime.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/page.hxx | 6 | ||||
| -rw-r--r-- | canvas/source/tools/pagemanager.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/surface.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/surfaceproxy.hxx | 2 |
5 files changed, 7 insertions, 7 deletions
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<ElapsedTime> const & pTimeBase ) + std::shared_ptr<ElapsedTime> 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 <canvas/rendering/isurface.hxx> #include <list> +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> #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 |