diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-31 18:31:01 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-31 21:24:26 +0200 |
| commit | 9e90038b73b84e622e20145ac56c642996e658e9 (patch) | |
| tree | 850df54f78a0380b5825232e4bdddf5075b23735 /canvas | |
| parent | 69885050705d65803b0176beb7ffc7938d527396 (diff) | |
canvas: replace boost::function with std::function
Change-Id: Ia3644bc0d9db2159aa4e9f05ca2f36e60b63e6f4
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 1 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/simplecanvas/simplecanvasimpl.cxx | 1 | ||||
| -rw-r--r-- | canvas/source/tools/propertysethelper.cxx | 4 |
4 files changed, 5 insertions, 3 deletions
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 3861c4aaa489..6fb306f4d5fa 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -37,6 +37,7 @@ #include <GL/glew.h> #include <boost/bind.hpp> +#include <boost/function.hpp> #include <memory> diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 876400407661..25c9e9ba794e 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -297,7 +297,7 @@ namespace oglcanvas SpriteComparator()); std::for_each(aSprites.begin(), aSprites.end(), - boost::mem_fn(&CanvasCustomSprite::renderSprite)); + std::mem_fn(&CanvasCustomSprite::renderSprite)); // frame counter, other info diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index af7f9dfb439d..1579fcd9fd1e 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -38,6 +38,7 @@ #include <canvas/canvastools.hxx> #include <boost/bind.hpp> +#include <boost/function.hpp> #define SERVICE_NAME "com.sun.star.rendering.SimpleCanvas" diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx index 477fda9ee19c..33ddcbd1543f 100644 --- a/canvas/source/tools/propertysethelper.cxx +++ b/canvas/source/tools/propertysethelper.cxx @@ -110,7 +110,7 @@ namespace canvas throwUnknown( aPropertyName ); } - if( aCallbacks.setter.empty() ) + if (!aCallbacks.setter) throwVeto( aPropertyName ); aCallbacks.setter(aValue); @@ -126,7 +126,7 @@ namespace canvas throwUnknown( aPropertyName ); } - if( !aCallbacks.getter.empty() ) + if (aCallbacks.getter) return aCallbacks.getter(); // TODO(Q1): subtlety, empty getter method silently returns |