diff options
Diffstat (limited to 'canvas/source/opengl')
-rw-r--r-- | canvas/source/opengl/ogl_bitmapcanvashelper.hxx | 6 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_buffercontext.hxx | 5 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_canvasbitmap.hxx | 2 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_canvasfont.hxx | 1 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.hxx | 3 |
5 files changed, 3 insertions, 14 deletions
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx index c820d307e695..cfb8ff8163b2 100644 --- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx +++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx @@ -15,14 +15,8 @@ #include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2dsize.hxx> - -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> -#include <vector> - #include "ogl_canvashelper.hxx" - namespace oglcanvas { /** Helper class for basic canvas functionality. */ diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx index a99446b7ad2c..202e0634dbad 100644 --- a/canvas/source/opengl/ogl_buffercontext.hxx +++ b/canvas/source/opengl/ogl_buffercontext.hxx @@ -13,8 +13,7 @@ #include <GL/glew.h> #include <sal/config.h> -#include <boost/shared_ptr.hpp> - +#include <memory> namespace oglcanvas { @@ -31,7 +30,7 @@ namespace oglcanvas virtual GLuint getTextureId() = 0; }; - typedef ::boost::shared_ptr<IBufferContext> IBufferContextSharedPtr; + typedef std::shared_ptr<IBufferContext> IBufferContextSharedPtr; } #endif diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx index ba2d0a6dd8be..99cc42548053 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.hxx +++ b/canvas/source/opengl/ogl_canvasbitmap.hxx @@ -19,8 +19,6 @@ #include <canvas/base/basemutexhelper.hxx> #include <basegfx/vector/b2isize.hxx> -#include <boost/shared_ptr.hpp> - #include "ogl_bitmapcanvashelper.hxx" #include "ogl_spritecanvas.hxx" diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index 12f66171b0ac..3a87a1c3e907 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -18,7 +18,6 @@ #include <rtl/ref.hxx> -#include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx index 2a9914506aeb..e7a10764a91e 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.hxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx @@ -16,7 +16,6 @@ #include <canvas/elapsedtime.hxx> #include <com/sun/star/rendering/XGraphicDevice.hpp> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include "ogl_buffercontext.hxx" @@ -131,7 +130,7 @@ namespace oglcanvas /// For the frame counter timings ::canvas::tools::ElapsedTime maLastUpdate; - boost::shared_ptr<TextureCache> mpTextureCache; + std::shared_ptr<TextureCache> mpTextureCache; unsigned int mnLinearTwoColorGradientProgram; unsigned int mnLinearMultiColorGradientProgram; |