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>

9 files changed, 25 insertions, 37 deletions

diff --git a/include/canvas/debug.hxx b/include/canvas/debug.hxx
index 275fc45d1279..308026a0e188 100644
--- a/include/canvas/debug.hxx
+++ b/include/canvas/debug.hxx
@@ -26,7 +26,7 @@
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 
 # include <sal/config.h>
-# include <boost/shared_ptr.hpp>
+# include <memory>
 
 ::std::size_t find_unreachable_objects( bool );
 
diff --git a/include/canvas/elapsedtime.hxx b/include/canvas/elapsedtime.hxx
index f942749c8a6a..f1d68ba8527f 100644
--- a/include/canvas/elapsedtime.hxx
+++ b/include/canvas/elapsedtime.hxx
@@ -21,9 +21,8 @@
 #define INCLUDED_CANVAS_ELAPSEDTIME_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
 #include <canvas/canvastoolsdllapi.h>
+#include <memory>
 
 namespace canvas
 {
@@ -57,7 +56,7 @@ namespace canvas
                 are not taken from the system's time base, but from
                 the provided timer.
              */
-            ElapsedTime( ::boost::shared_ptr<ElapsedTime> const & pTimeBase );
+            ElapsedTime( std::shared_ptr<ElapsedTime> const & pTimeBase );
 
             /** Reset the time
 
@@ -147,7 +146,7 @@ namespace canvas
             double getCurrentTime() const;
             double getElapsedTimeImpl() const; // does not set m_fLastQueriedTime
 
-            const ::boost::shared_ptr<ElapsedTime>  m_pTimeBase;
+            const std::shared_ptr<ElapsedTime>  m_pTimeBase;
 
             /// To validate adjustTimer() calls with bLimitToLastQueriedTime=true
             mutable double                          m_fLastQueriedTime;
diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx
index 9fc1070f243a..d8061889d6bd 100644
--- a/include/canvas/rendering/bitmap.hxx
+++ b/include/canvas/rendering/bitmap.hxx
@@ -29,7 +29,6 @@
 #include <canvas/rendering/icachedprimitive.hxx>
 #include <canvas/rendering/isurfaceproxymanager.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <memory>
 #include <vector>
 
@@ -214,7 +213,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&         renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
+            const ::std::vector< std::shared_ptr<Bitmap> >&     textureAnnotations,
             const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
         /** See XCanvas interface
 
@@ -231,7 +230,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&         renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
+            const ::std::vector< std::shared_ptr<Bitmap> >&     textureAnnotations,
             const ::com::sun::star::uno::Reference<
                   ::com::sun::star::geometry::XMapping2D >&         xMapping,
             const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
@@ -256,7 +255,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&         renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations );
+            const ::std::vector< std::shared_ptr<Bitmap> >&     textureAnnotations );
         /** See XCanvas interface
 
             @param textureAnnotations
@@ -272,7 +271,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&         renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
+            const ::std::vector< std::shared_ptr<Bitmap> >&     textureAnnotations,
             const ::com::sun::star::uno::Reference<
                   ::com::sun::star::geometry::XMapping2D >&         xMapping );
 
@@ -284,7 +283,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState& renderState );
         /// See XCanvas interface
         ICachedPrimitiveSharedPtr drawBitmap(
-            const ::boost::shared_ptr<Bitmap>&              rImage,
+            const std::shared_ptr<Bitmap>&              rImage,
             const ::com::sun::star::rendering::ViewState&   viewState,
             const ::com::sun::star::rendering::RenderState& renderState );
 
@@ -296,7 +295,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&     renderState );
         /// See XCanvas interface
         ICachedPrimitiveSharedPtr drawBitmapModulated(
-            const ::boost::shared_ptr<Bitmap>&                  rImage,
+            const std::shared_ptr<Bitmap>&                  rImage,
             const ::com::sun::star::rendering::ViewState&       viewState,
             const ::com::sun::star::rendering::RenderState&     renderState );
 
@@ -306,7 +305,7 @@ namespace canvas
         const std::unique_ptr< ImplBitmap > mxImpl;
     };
 
-    typedef ::boost::shared_ptr< Bitmap > BitmapSharedPtr;
+    typedef std::shared_ptr< Bitmap > BitmapSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_BITMAP_HXX
diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx
index 8df4cc94a136..ecf5843ae4c3 100644
--- a/include/canvas/rendering/icachedprimitive.hxx
+++ b/include/canvas/rendering/icachedprimitive.hxx
@@ -22,8 +22,7 @@
 
 #include <sal/types.h>
 
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace basegfx
 {
@@ -52,7 +51,7 @@ namespace canvas
         virtual sal_Int8 redraw( const ::com::sun::star::rendering::ViewState& aState ) const = 0;
     };
 
-    typedef ::boost::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr;
+    typedef std::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx
index a9922bead33e..6b8c8c0ee1ef 100644
--- a/include/canvas/rendering/icolorbuffer.hxx
+++ b/include/canvas/rendering/icolorbuffer.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace canvas
 {
@@ -80,7 +78,7 @@ namespace canvas
         virtual Format getFormat() const = 0;
     };
 
-    typedef ::boost::shared_ptr< IColorBuffer > IColorBufferSharedPtr;
+    typedef std::shared_ptr< IColorBuffer > IColorBufferSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
diff --git a/include/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx
index cbde9e67cb97..2e78d1ee2f19 100644
--- a/include/canvas/rendering/irendermodule.hxx
+++ b/include/canvas/rendering/irendermodule.hxx
@@ -21,10 +21,8 @@
 #define INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
-
+#include <memory>
 
 namespace basegfx
 {
@@ -85,7 +83,7 @@ namespace canvas
             @return a pointer to a surface, which is an abstraction of
             a piece of (possibly hardware-accelerated) texture memory.
          */
-        virtual ::boost::shared_ptr<ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) = 0;
+        virtual std::shared_ptr<ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) = 0;
 
         /** Begin rendering the given primitive.
 
@@ -116,7 +114,7 @@ namespace canvas
         virtual bool      isError() = 0;
     };
 
-    typedef ::boost::shared_ptr< IRenderModule > IRenderModuleSharedPtr;
+    typedef std::shared_ptr< IRenderModule > IRenderModuleSharedPtr;
 
     /// Little RAII wrapper for guarding access to IRenderModule interface
     class RenderModuleGuard : private ::boost::noncopyable
diff --git a/include/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx
index 1e8e47a5578b..896a4396324f 100644
--- a/include/canvas/rendering/isurface.hxx
+++ b/include/canvas/rendering/isurface.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace basegfx
 {
@@ -74,7 +72,7 @@ namespace canvas
         virtual ::basegfx::B2IVector getSize() = 0;
     };
 
-    typedef ::boost::shared_ptr< ISurface > ISurfaceSharedPtr;
+    typedef std::shared_ptr< ISurface > ISurfaceSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
diff --git a/include/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx
index 47a2e98b3d94..9523ffa40a30 100644
--- a/include/canvas/rendering/isurfaceproxy.hxx
+++ b/include/canvas/rendering/isurfaceproxy.hxx
@@ -21,8 +21,7 @@
 #define INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
 
 #include <canvas/rendering/irendermodule.hxx>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace basegfx
 {
@@ -99,7 +98,7 @@ namespace canvas
                            const ::basegfx::B2DHomMatrix&   rTransform ) = 0;
     };
 
-    typedef ::boost::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr;
+    typedef std::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
diff --git a/include/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx
index 7172748f8531..c2ba559d4c48 100644
--- a/include/canvas/rendering/isurfaceproxymanager.hxx
+++ b/include/canvas/rendering/isurfaceproxymanager.hxx
@@ -22,10 +22,8 @@
 
 #include <canvas/rendering/irendermodule.hxx>
 #include <canvas/rendering/icolorbuffer.hxx>
-
-#include <boost/shared_ptr.hpp>
-
 #include <canvas/canvastoolsdllapi.h>
+#include <memory>
 
 namespace canvas
 {
@@ -57,11 +55,11 @@ namespace canvas
             Internally this texture may even be distributed to several
             real hardware surfaces.
         */
-        virtual ::boost::shared_ptr< ISurfaceProxy > createSurfaceProxy(
+        virtual std::shared_ptr< ISurfaceProxy > createSurfaceProxy(
             const IColorBufferSharedPtr& pBuffer ) const = 0;
     };
 
-    typedef ::boost::shared_ptr< ISurfaceProxyManager > ISurfaceProxyManagerSharedPtr;
+    typedef std::shared_ptr< ISurfaceProxyManager > ISurfaceProxyManagerSharedPtr;
 
 
     /** Create a surface proxy for the given render module.