diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-12 12:21:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-13 19:38:08 +0000 |
| commit | 47d3e82e4f2c0c06231c952a0cc2456b712da0cc (patch) | |
| tree | 0f5d4aa62edb85d7c13bb6430aadfa9635c9e3ef /include/basebmp | |
| parent | libfreehand: FHTransform defined as a struct but declared as a class (diff) | |
| download | core-47d3e82e4f2c0c06231c952a0cc2456b712da0cc.tar.gz core-47d3e82e4f2c0c06231c952a0cc2456b712da0cc.zip | |
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/basebmp')
| -rw-r--r-- | include/basebmp/bitmapdevice.hxx | 10 |
1 files changed, 4 insertions, 6 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: |