summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-12 12:21:12 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-13 19:38:08 +0000
commit47d3e82e4f2c0c06231c952a0cc2456b712da0cc (patch)
tree0f5d4aa62edb85d7c13bb6430aadfa9635c9e3ef /include
parentab5f16eb37d8fa2b7924f1e19f9fe8f373714adc (diff)
boost->std
Change-Id: I9b4f884c6313a53fea543ea6f93175205351ad14 Reviewed-on: https://gerrit.libreoffice.org/18517 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 'include')
-rw-r--r--include/basebmp/bitmapdevice.hxx10
-rw-r--r--include/vcl/cairo.hxx10
-rw-r--r--include/vcl/opengl/OpenGLContext.hxx2
3 files changed, 10 insertions, 12 deletions
diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx
index 7668f9cab19c..924d505a9e75 100644
--- a/include/basebmp/bitmapdevice.hxx
+++ b/include/basebmp/bitmapdevice.hxx
@@ -25,9 +25,7 @@
#include <basebmp/scanlineformats.hxx>
#include <basebmp/basebmpdllapi.h>
-#include <boost/shared_ptr.hpp>
#include <boost/shared_array.hpp>
-#include <boost/enable_shared_from_this.hpp>
#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>
@@ -47,10 +45,10 @@ namespace basebmp
// Temporary. Use like the tools color object
class Color;
-typedef boost::shared_ptr< class BitmapDevice > BitmapDeviceSharedPtr;
-typedef boost::shared_ptr< struct IBitmapDeviceDamageTracker > IBitmapDeviceDamageTrackerSharedPtr;
+typedef std::shared_ptr< class BitmapDevice > BitmapDeviceSharedPtr;
+typedef std::shared_ptr< struct IBitmapDeviceDamageTracker > IBitmapDeviceDamageTrackerSharedPtr;
typedef boost::shared_array< sal_uInt8 > RawMemorySharedArray;
-typedef boost::shared_ptr< const std::vector<Color> > PaletteMemorySharedVector;
+typedef std::shared_ptr< const std::vector<Color> > PaletteMemorySharedVector;
struct ImplBitmapDevice;
@@ -76,7 +74,7 @@ protected:
works best when given as an eight bit grey bitmap. Everything else
is accepted, but potentially slow.
*/
-class BASEBMP_DLLPUBLIC BitmapDevice : public boost::enable_shared_from_this<BitmapDevice>,
+class BASEBMP_DLLPUBLIC BitmapDevice : public std::enable_shared_from_this<BitmapDevice>,
private boost::noncopyable
{
public:
diff --git a/include/vcl/cairo.hxx b/include/vcl/cairo.hxx
index 13983a84d63f..7ca45efba74f 100644
--- a/include/vcl/cairo.hxx
+++ b/include/vcl/cairo.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_VCL_CAIRO_HXX
#include <sal/config.h>
-#include <boost/shared_ptr.hpp>
#include <vcl/vclptr.hxx>
+#include <memory>
typedef struct _cairo_surface cairo_surface_t;
typedef struct _cairo cairo_t;
@@ -31,8 +31,8 @@ class VirtualDevice;
namespace cairo {
- typedef boost::shared_ptr<cairo_surface_t> CairoSurfaceSharedPtr;
- typedef boost::shared_ptr<cairo_t> CairoSharedPtr;
+ typedef std::shared_ptr<cairo_surface_t> CairoSurfaceSharedPtr;
+ typedef std::shared_ptr<cairo_t> CairoSharedPtr;
/** Cairo surface interface
@@ -47,7 +47,7 @@ namespace cairo {
// Query methods
virtual CairoSharedPtr getCairo() const = 0;
virtual CairoSurfaceSharedPtr getCairoSurface() const = 0;
- virtual boost::shared_ptr<Surface> getSimilar(int cairo_content_type, int width, int height) const = 0;
+ virtual std::shared_ptr<Surface> getSimilar(int cairo_content_type, int width, int height) const = 0;
/// factory for VirDev on this surface
virtual VclPtr<VirtualDevice> createVirtualDevice() const = 0;
@@ -60,7 +60,7 @@ namespace cairo {
virtual void flush() const = 0;
};
- typedef boost::shared_ptr<Surface> SurfaceSharedPtr;
+ typedef std::shared_ptr<Surface> SurfaceSharedPtr;
}
#endif
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 74fab27e3635..ecc503829051 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -279,7 +279,7 @@ private:
OUString fragmentShader;
OString preamble;
};
- std::map<ProgramKey, boost::shared_ptr<OpenGLProgram> > maPrograms;
+ std::map<ProgramKey, std::shared_ptr<OpenGLProgram> > maPrograms;
OpenGLProgram* mpCurrentProgram;
#ifdef DBG_UTIL
std::set<SalGraphicsImpl*> maParents;