[cairo-commit] cairomm/cairomm refptr.h,1.5,1.6

[Murray Cumming]

Committed by: murrayc

Update of /cvs/cairo/cairomm/cairomm
In directory kemper:/tmp/cvs-serv25251/cairomm

Modified Files:
	refptr.h 
Log Message:
2006-09-27  Murray Cumming  <murrayc at murrayc.com>

        * cairomm/refptr.h: cast_static() and cast_dynamic():
        Use the refcount_() accessor instead of the member variable,
        to avoid compilation errors, as we already doing in the
        templated copy constructor.


Index: refptr.h
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/refptr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- refptr.h	11 Jul 2006 18:54:10 -0000	1.5
+++ refptr.h	27 Sep 2006 18:38:57 -0000	1.6
@@ -342,8 +342,8 @@
 {
   T_CppObject *const pCppObject = dynamic_cast<T_CppObject*>(src.operator->());
 
-  if(pCppObject && src.pCppRefcount_)
-    ++(*(src.pCppRefcount_));
+  if(pCppObject && src.refcount_())
+    ++(*(src.refcount_()));
 
   return RefPtr<T_CppObject>(pCppObject); //TODO: Does an unnecessary extra reference() on the C object.
 }
@@ -355,8 +355,8 @@
 {
   T_CppObject *const pCppObject = static_cast<T_CppObject*>(src.operator->());
 
-  if(pCppObject && src.pCppRefcount_)
-    ++(*(src.pCppRefcount_));
+  if(pCppObject && src.refcount_())
+    ++(*(src.refcount_()));
 
   return RefPtr<T_CppObject>(pCppObject); //TODO: Does an unnecessary extra reference() on the C object.
 }
@@ -368,8 +368,8 @@
 {
   T_CppObject *const pCppObject = const_cast<T_CppObject*>(src.operator->());
 
-  if(pCppObject && src.pCppRefcount_)
-    ++(*(src.pCppRefcount_));
+  if(pCppObject && src.refcount_())
+    ++(*(src.refcount_()));
 
   return RefPtr<T_CppObject>(pCppObject); //TODO: Does an unnecessary extra reference() on the C object.
 }