diff options
author | Herbert Dürr <hdu@apache.org> | 2014-01-21 14:09:37 +0000 |
---|---|---|
committer | Herbert Dürr <hdu@apache.org> | 2014-01-21 14:09:37 +0000 |
commit | 1ceda390389a3e7bf4b7bb72b533a355a0fa060d (patch) | |
tree | 417f4c4999f04efcff3ebc8a5454bafbabce770b /slideshow/source/engine | |
parent | 275a1d7a011e79a7f9c44c51e947d2cb50197051 (diff) |
#i123817# boost::shared_ptr doesn't have an implicit conversion to bool
Constructs that expect it fail at least in XCode4's clang in C++11 mode.
An implicit conversion from pointer to bool is already suspicious enough
and a shared_ptr->pointer->bool conversion is even worse. Cleaning up
the code fixes the build breaker seen in boost/libc++/clang environments.
Notes
Notes:
prefer: d4bab97023e3569571a92551040574b20aceca7c
Diffstat (limited to 'slideshow/source/engine')
-rw-r--r-- | slideshow/source/engine/animatedsprite.cxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/shapes/viewshape.cxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/shapesubset.cxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/slide/slideanimations.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index 22b2cc13f3bb..0b6e61288bbb 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -157,7 +157,7 @@ namespace slideshow } } - return mpSprite; + return (mpSprite.get() != NULL); } void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 46f0f2eaa18d..0265acbf6887 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -184,7 +184,7 @@ namespace slideshow } } - return io_rCacheEntry.mpRenderer; + return (io_rCacheEntry.mpRenderer.get() != NULL); } bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 77e76a4c4076..f6783a83ae5e 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -110,7 +110,7 @@ namespace slideshow maTreeNode ); } - return mpSubsetShape; + return (mpSubsetShape.get() != NULL); } void ShapeSubset::disableSubsetShape() diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 55db7e5cdf22..16e16a0e2eee 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -80,7 +80,7 @@ namespace slideshow SHOW_NODE_TREE( mpRootNode ); - return mpRootNode; + return (mpRootNode.get() != NULL); } bool SlideAnimations::isAnimated() const |