Attachment 7269 Details for Bug 8511 – cairomm_refptr_cast_refcount.patch

[patch] cairomm_refptr_cast_refcount.patch

cairomm_refptr_cast_refcount.patch (text/plain), 3.16 KB, created by Murray Cumming on 2006-10-05 06:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Murray Cumming

Created: 2006-10-05 06:30:02 UTC

Size: 3.16 KB

patch

obsolete

>? atdoc.patch
>? cairomm_refptr.patch
>? cairomm_refptr_cast_refcount.patch
>? temp.patch
>? test.cc
>Index: ChangeLog
>===================================================================
>RCS file: /cvs/cairo/cairomm/ChangeLog,v
>retrieving revision 1.88
>diff -u -p -r1.88 ChangeLog
>--- ChangeLog	27 Sep 2006 18:40:31 -0000	1.88
>+++ ChangeLog	5 Oct 2006 13:23:10 -0000
>@@ -1,3 +1,10 @@
>+2006-10-05  Murray Cumming  <murrayc@murrayc.com>
>+
>+	* cairomm/refptr.h: Added RefPtr(object, refcount) constructor
>+	for use in cast_*(), so that the casted RefPtr shares the same 
>+	refcount, avoiding an early deletion. I do not like making 
>+	this constructor public, but I do not see another way.
>+
> 2006-09-27  Murray Cumming  <murrayc@murrayc.com>
> 
> 	* cairomm/refptr.h: cast_static() and cast_dynamic(): 
>Index: cairomm/refptr.h
>===================================================================
>RCS file: /cvs/cairo/cairomm/cairomm/refptr.h,v
>retrieving revision 1.6
>diff -u -p -r1.6 refptr.h
>--- cairomm/refptr.h	27 Sep 2006 18:38:57 -0000	1.6
>+++ cairomm/refptr.h	5 Oct 2006 13:23:10 -0000
>@@ -64,6 +64,9 @@ public:
>    */
>   explicit inline RefPtr(T_CppObject* pCppObject);
> 
>+  ///  For use only in the internal implementation of sharedptr.
>+  explicit inline RefPtr(T_CppObject* pCppObject, int* refcount);
>+
>   /** Copy constructor
>    *
>    * This increments the shared reference count.
>@@ -227,6 +230,17 @@ RefPtr<T_CppObject>::RefPtr(T_CppObject*
>   }
> }
> 
>+//Used by cast_*() implementations:
>+template <class T_CppObject> inline
>+RefPtr<T_CppObject>::RefPtr(T_CppObject* pCppObject, int* refcount)
>+:
>+  pCppObject_(pCppObject),
>+  pCppRefcount_(refcount)
>+{
>+  if(pCppObject_ && pCppRefcount_)
>+    ++(*pCppRefcount_);
>+}
>+
> template <class T_CppObject> inline
> RefPtr<T_CppObject>::RefPtr(const RefPtr<T_CppObject>& src)
> :
>@@ -342,10 +356,10 @@ RefPtr<T_CppObject> RefPtr<T_CppObject>:
> {
>   T_CppObject *const pCppObject = dynamic_cast<T_CppObject*>(src.operator->());
> 
>-  if(pCppObject && src.refcount_())
>-    ++(*(src.refcount_()));
>-
>-  return RefPtr<T_CppObject>(pCppObject); //TODO: Does an unnecessary extra reference() on the C object.
>+  if(pCppObject) //Check whether dynamic_cast<> succeeded so we don't pass a null object with a used refcount:
>+    return RefPtr<T_CppObject>(pCppObject, src.refcount_());
>+  else
>+    return RefPtr<T_CppObject>();
> }
> 
> template <class T_CppObject>
>@@ -355,10 +369,7 @@ RefPtr<T_CppObject> RefPtr<T_CppObject>:
> {
>   T_CppObject *const pCppObject = static_cast<T_CppObject*>(src.operator->());
> 
>-  if(pCppObject && src.refcount_())
>-    ++(*(src.refcount_()));
>-
>-  return RefPtr<T_CppObject>(pCppObject); //TODO: Does an unnecessary extra reference() on the C object.
>+  return RefPtr<T_CppObject>(pCppObject, src.refcount_());
> }
> 
> template <class T_CppObject>
>@@ -368,10 +379,7 @@ RefPtr<T_CppObject> RefPtr<T_CppObject>:
> {
>   T_CppObject *const pCppObject = const_cast<T_CppObject*>(src.operator->());
> 
>-  if(pCppObject && src.refcount_())
>-    ++(*(src.refcount_()));
>-
>-  return RefPtr<T_CppObject>(pCppObject); //TODO: Does an unnecessary extra reference() on the C object.
>+  return RefPtr<T_CppObject>(pCppObject, src.refcount_());
> }
> 
> #endif /* DOXYGEN_IGNORE_THIS */

Actions: View | Splinter Review

Attachments on bug 8511: 7269

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.