From 776b7235e23735189dbeafa6de93a4a2eaa2bf30 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 13 Jul 2006 08:55:34 +0000 Subject: INTEGRATION: CWS cowfixes01 (1.3.20); FILE MERGED 2006/03/17 23:16:35 thb 1.3.20.2: #i63310# Moved BxD(Poly)Polygon to cow_wrapper; added makeUnique() to all classes using COW internally (to at least facilitate deliberate unsharing in multi-threaded uses) 2006/03/17 17:41:32 thb 1.3.20.1: #i63310# Added COW to B2DMultiRange (wasn't there before); moved BxDHomMatrix to cow_wrapper; added o3tl build dependency --- basegfx/inc/basegfx/range/b2dmultirange.hxx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/basegfx/inc/basegfx/range/b2dmultirange.hxx b/basegfx/inc/basegfx/range/b2dmultirange.hxx index be880d25ebaa..1b4e1e02d0f9 100644 --- a/basegfx/inc/basegfx/range/b2dmultirange.hxx +++ b/basegfx/inc/basegfx/range/b2dmultirange.hxx @@ -4,9 +4,9 @@ * * $RCSfile: b2dmultirange.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:32:17 $ + * last change: $Author: obo $ $Date: 2006-07-13 09:55:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,10 @@ #ifndef _BGFX_RANGE_B2DMULTIRANGE_HXX #define _BGFX_RANGE_B2DMULTIRANGE_HXX +#ifndef INCLUDED_O3TL_COW_WRAPPER_HXX +#include +#endif + #include @@ -66,6 +70,9 @@ namespace basegfx */ explicit B2DMultiRange( const B2DRange& rRange ); + B2DMultiRange( const B2DMultiRange& ); + B2DMultiRange& operator=( const B2DMultiRange& ); + /** Check whether range is empty. @return true, if this object either contains no ranges at @@ -111,13 +118,7 @@ namespace basegfx B2DPolyPolygon getPolyPolygon() const; private: - // TODO(F1): Maybe provide a shared COW implementation here - - // default: disabled copy/assignment - B2DMultiRange(const B2DMultiRange&); - B2DMultiRange& operator=( const B2DMultiRange& ); - - ::std::auto_ptr< ImplB2DMultiRange > mpImpl; + o3tl::cow_wrapper< ImplB2DMultiRange > mpImpl; }; } -- cgit v1.2.3