Packets: Fix VariantParser invalid parser access bug

[senf.git] / Utils / intrusive_refcount.cti

diff --git a/Utils/intrusive_refcount.cti b/Utils/intrusive_refcount.cti
index 049084a..976e1ae 100644 (file)
--- a/Utils/intrusive_refcount.cti
+++ b/Utils/intrusive_refcount.cti
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -30,28 +30,28 @@
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
 
-template <class Self>
-prefix_ void senf::intrusive_refcount_t<Self>::intrusive_ptr_add_ref()
+template <class S>
+prefix_ void senf::intrusive_refcount_base::intrusive_ptr_add_ref()
 {
-    static_cast<Self*>(this)->add_ref();
+    static_cast<S*>(this)->add_ref();
 }
 
-template <class Self>
-prefix_ void senf::intrusive_refcount_t<Self>::intrusive_ptr_release()
+template <class S>
+prefix_ void senf::intrusive_refcount_base::intrusive_ptr_release()
 {
-    if (static_cast<Self*>(this)->release()) delete this;
+    if (static_cast<S*>(this)->release()) delete this;
 }
 
 template <class Self>
-prefix_ void senf::intrusive_ptr_add_ref(intrusive_refcount_t<Self>* p)
+prefix_ void senf::intrusive_ptr_add_ref(intrusive_refcount_t<Self> const * p)
 {
-    p->intrusive_ptr_add_ref();
+    const_cast<intrusive_refcount_t<Self>*>(p)->intrusive_ptr_add_ref<Self>();
 }
 
 template <class Self>
-prefix_ void senf::intrusive_ptr_release(intrusive_refcount_t<Self>* p)
+prefix_ void senf::intrusive_ptr_release(intrusive_refcount_t<Self> const * p)
 {
-    p->intrusive_ptr_release();
+    const_cast<intrusive_refcount_t<Self>*>(p)->intrusive_ptr_release<Self>();
 }
 
 template <class Self>