[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/smart_ptr.h libbase/sma...
|
From: |
Markus Gothe |
|
Subject: |
[Gnash-commit] gnash ChangeLog libbase/smart_ptr.h libbase/sma... |
|
Date: |
Thu, 05 Oct 2006 16:03:36 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/05 16:03:36
Modified files:
. : ChangeLog
libbase : smart_ptr.h
Removed files:
libbase : smart_ptr.hpp
Log message:
Conform to Boost-header...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1041&r2=1.1042
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/smart_ptr.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/smart_ptr.hpp?cvsroot=gnash&r1=1.17&r2=0
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1041
retrieving revision 1.1042
diff -u -b -r1.1041 -r1.1042
--- ChangeLog 5 Oct 2006 15:46:09 -0000 1.1041
+++ ChangeLog 5 Oct 2006 16:03:36 -0000 1.1042
@@ -1,6 +1,7 @@
2006-10-05 Markus Gothe <address@hidden>
* libbase/log.cpp: Added #define BOOST_HAS_THREADS.
+ * libbase/smart_ptr.hpp: Removed.
2006-10-05 Sandro Santilli <address@hidden>
Index: libbase/smart_ptr.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/smart_ptr.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/smart_ptr.h 2 Oct 2006 23:51:35 -0000 1.7
+++ libbase/smart_ptr.h 5 Oct 2006 16:03:36 -0000 1.8
@@ -9,12 +9,11 @@
// although the nice thing about templates is that no particular
// ref-counted class is mandated.
+/* $Id: smart_ptr.h,v 1.8 2006/10/05 16:03:36 nihilus Exp $ */
#ifndef SMART_PTR_H
#define SMART_PTR_H
-#include "smart_ptr.hpp"
-
#include "tu_config.h"
#include "utility.h"
Index: libbase/smart_ptr.hpp
===================================================================
RCS file: libbase/smart_ptr.hpp
diff -N libbase/smart_ptr.hpp
--- libbase/smart_ptr.hpp 28 Sep 2006 17:17:25 -0000 1.17
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,1293 +0,0 @@
-//
-// Boost Software License - Version 1.0 - August 17th, 2003
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-/* $Id: smart_ptr.hpp,v 1.17 2006/09/28 17:17:25 nihilus Exp $ */
-
-#ifndef SMART_PTR_HPP
-#define SMART_PTR_HPP
-
-#include <cassert>
-#include <cstddef>
-#include <memory>
-#include <typeinfo>
-#include <exception>
-#include <algorithm>
-#include <functional>
-
-namespace boost {
-
- typedef long long long_long_type;
- typedef unsigned long long ulong_long_type;
-
- template < class T > inline void checked_delete(T * x)
- {
- typedef char type_must_be_complete[sizeof(T) ? 1 : -1];
- (void) sizeof(type_must_be_complete);
- delete x;
- }
-
- template < class T > inline void checked_array_delete(T * x)
- {
- typedef char type_must_be_complete[sizeof(T) ? 1 : -1];
- (void) sizeof(type_must_be_complete);
- delete[]x;
- }
-
-template < class T >
-struct checked_deleter {
- typedef void result_type;
- typedef T *argument_type;
-
- void operator()(T * x) const {
- boost::checked_delete(x);
- }
-};
-
-template < class T >
-struct checked_array_deleter {
- typedef void result_type;
- typedef T *argument_type;
-
- void operator()(T * x) const {
- boost::checked_array_delete(x);
- }
-};
-
-template < class T >
-class scoped_ptr {
-
-private:
- T * ptr;
- scoped_ptr(scoped_ptr const &);
- scoped_ptr & operator= (scoped_ptr const &);
- typedef scoped_ptr < T > this_type;
-
-public:
- typedef T element_type;
-
- explicit scoped_ptr(T * p = 0)
- :
- ptr(p)
- {
- }
-
- explicit scoped_ptr(std::auto_ptr < T > p)
- :
- ptr(p.release())
- {
- }
-
- ~scoped_ptr()
- {
- boost::checked_delete(ptr);
- }
-
- void reset(T * p = 0)
- {
- ((p == 0 || p != ptr) ? ((void)0) : assert(p == 0 || p != ptr));
- this_type(p).swap(*this);
- }
-
- T & operator*() const
- {
- ((ptr != 0) ? ((void)0) : assert(ptr != 0));
- return *ptr;
- }
-
- T * operator->() const
- {
- ((ptr != 0) ? ((void)0) : assert(ptr != 0));
- return ptr;
- }
-
- T * get() const
- {
- return ptr;
- }
-
- typedef T * this_type::*unspecified_bool_type;
-
- operator unspecified_bool_type() const
- {
- return ptr == 0 ? 0 : &this_type::ptr;
- }
-
- bool operator!() const
- {
- return ptr == 0;
- }
-
- void swap(scoped_ptr & b)
- {
- T * tmp = b.ptr;
- b.ptr = ptr;
- ptr = tmp;
- }
-};
-
- template < class T > inline void swap(scoped_ptr < T > &a, scoped_ptr <
T > &b)
- {
- a.swap(b);
- }
-
- template < class T > inline T * get_pointer(scoped_ptr < T > const &p)
- {
- return p.get();
- }
-
-template < class T >
-class scoped_array {
-
-private:
- T * ptr; scoped_array(scoped_array const &);
- scoped_array & operator= (scoped_array const &);
- typedef scoped_array < T > this_type;
-
-public:
- typedef T element_type;
-
- explicit scoped_array(T * p = 0):ptr(p)
- {
- }
-
- ~scoped_array()
- {
- boost::checked_array_delete(ptr);
- }
-
- void reset(T * p = 0)
- {
- ((p == 0 || p != ptr) ? ((void)0) : assert(p == 0 || p != ptr));
- this_type(p).swap(*this);
- }
-
- T & operator[](std::ptrdiff_t i) const
- {
- ((ptr != 0) ? ((void)0) : assert(ptr != 0));
- ((i >= 0) ? ((void)0) : assert(i >= 0));
- return ptr[i];
- }
-
- T * get() const
- {
- return ptr;
- }
-
- typedef T * this_type::*unspecified_bool_type;
-
- operator unspecified_bool_type() const
- {
- return ptr == 0 ? 0 : &this_type::ptr;
- }
-
- bool operator!() const
- {
- return ptr == 0;
- }
-
- void swap(scoped_array & b)
- {
- T * tmp = b.ptr;
- b.ptr = ptr;
- ptr = tmp;
- }
-};
-
- template < class T > inline void swap(scoped_array < T > &a,
scoped_array < T > &b)
- {
- a.swap(b);
- }
-
- template < class E > inline void throw_exception(E const &e)
- {
- throw e;
- }
-
-class bad_weak_ptr : public std::exception {
-public:
- virtual char const *what() const throw()
- {
- return "boost::bad_weak_ptr";
- }
-};
-
-namespace detail {
-
-class sp_counted_base {
-
-private:
-
- sp_counted_base(sp_counted_base const &);
- sp_counted_base & operator= (sp_counted_base const &);
- long use_count_;
- long weak_count_;
-
-public:
-
- sp_counted_base()
- :
- use_count_(1),
- weak_count_(1)
- {
- }
-
- virtual ~sp_counted_base()
- {
- }
-
- virtual void dispose() = 0;
- virtual void destroy()
- {
- delete this;
- }
-
- virtual void *get_deleter(std::type_info const &ti) = 0;
-
- void add_ref_copy()
- {
- ++use_count_;
- }
-
- bool add_ref_lock()
- {
- if(use_count_ == 0)
- return false; ++use_count_;
- return true;
- }
-
- void release()
- {
- if(--use_count_ == 0)
- {
- dispose();
- weak_release();
- }
- }
-
- void weak_add_ref()
- {
- ++weak_count_;
- }
-
- void weak_release()
- {
- if(--weak_count_ == 0)
- {
- destroy();
- }
- }
-
- long use_count() const
- {
- return use_count_;
- }
-};
-
-template < class X >
-class sp_counted_impl_p : public sp_counted_base {
-
-private:
-
- X * px_;
- sp_counted_impl_p(sp_counted_impl_p const &);
- sp_counted_impl_p & operator= (sp_counted_impl_p const &);
- typedef sp_counted_impl_p < X > this_type;
-
-public:
-
- explicit sp_counted_impl_p(X * px)
- :
- px_(px)
- {
- }
-
- virtual void dispose()
- {
- boost::checked_delete(px_);
- }
-
- virtual void *get_deleter(std::type_info const &)
- {
- return 0;
- }
-
-};
-
-template < class P, class D >
-class sp_counted_impl_pd : public sp_counted_base {
-
-private:
-
- P ptr;
- D del;
- sp_counted_impl_pd(sp_counted_impl_pd const &);
- sp_counted_impl_pd & operator= (sp_counted_impl_pd const &);
- typedef sp_counted_impl_pd < P, D > this_type;
-
-public:
-
- sp_counted_impl_pd(P p, D d)
- :
- ptr(p),
- del(d)
- {
- }
-
- virtual void dispose()
- {
- del(ptr);
- }
-
- virtual void *get_deleter(std::type_info const &ti)
- {
- return ti == typeid(D) ? &del : 0;
- }
-};
-
-/* Forward decl. */
-class weak_count;
-
-class shared_count {
-
-private:
-
- sp_counted_base * pi_;
- friend class weak_count;
-
-public:
-
- shared_count()
- :
- pi_(0)
- {
- }
-
- template < class Y > explicit shared_count(Y * p)
- :
- pi_(0)
- {
- try
- {
- pi_ = new sp_counted_impl_p < Y > (p);
- }
- catch(...)
- {
- boost::checked_delete(p);
- throw;
- }
- }
-
- template < class P, class D > shared_count(P p, D d)
- :
- pi_(0)
- {
- try
- {
- pi_ = new sp_counted_impl_pd < P, D > (p, d);
- }
- catch(...)
- {
- d(p);
- throw;
- }
- }
-
- template < class Y > explicit shared_count(std::auto_ptr < Y > &r)
- :
- pi_(new sp_counted_impl_p < Y > (r.get()))
- {
- r.release();
- }
-
- ~shared_count()
- {
- if(pi_ != 0)pi_->release();
- }
-
- shared_count(shared_count const &r)
- :
- pi_(r.pi_)
- {
- if(pi_ != 0)pi_->add_ref_copy();
- }
-
- explicit shared_count(weak_count const &r);
-
- shared_count & operator= (shared_count const &r)
- {
- sp_counted_base * tmp = r.pi_;
- if(tmp != pi_)
- {
- if(tmp != 0)tmp->add_ref_copy();
- if(pi_ != 0)pi_->release();
- pi_ = tmp;
- }
- return *this;
- }
-
- void swap(shared_count & r)
- {
- sp_counted_base * tmp = r.pi_;
- r.pi_ = pi_;
- pi_ = tmp;
- }
-
- long use_count() const
- {
- return pi_ != 0 ? pi_->use_count(): 0;
- }
-
- bool unique() const
- {
- return use_count() == 1;
- }
-
- friend inline bool operator== (shared_count const &a, shared_count
const &b)
- {
- return a.pi_ == b.pi_;
- }
-
- friend inline bool operator< (shared_count const &a, shared_count const
&b)
- {
- return std::less < sp_counted_base * >()(a.pi_, b.pi_);
- }
-
- void *get_deleter(std::type_info const &ti) const
- {
- return pi_ ? pi_->get_deleter(ti) : 0;
- }
-};
-
-class weak_count {
-
-private:
- sp_counted_base * pi_;
- friend class shared_count;
-
-public:
- weak_count()
- :
- pi_(0)
- {
- }
-
- weak_count(shared_count const &r)
- :
- pi_(r.pi_)
- {
- if(pi_ != 0)pi_->weak_add_ref();
- }
-
- weak_count(weak_count const &r)
- :
- pi_(r.pi_)
- {
- if( pi_ != 0)pi_->weak_add_ref();
- }
-
- ~weak_count()
- {
- if(pi_ != 0)pi_->weak_release();
- }
-
- weak_count & operator= (shared_count const &r)
- {
- sp_counted_base * tmp = r.pi_;
- if(tmp != 0)tmp->weak_add_ref();
- if(pi_ != 0)pi_->weak_release();
- pi_ = tmp;
- return *this;
- }
-
- weak_count & operator= (weak_count const &r)
- {
- sp_counted_base * tmp = r.pi_;
- if(tmp != 0)tmp->weak_add_ref();
- if(pi_ != 0)pi_->weak_release();
- pi_ = tmp;
- return *this;
- }
-
- void swap(weak_count & r)
- {
- sp_counted_base * tmp = r.pi_;
- r.pi_ = pi_;
- pi_ = tmp;
- }
-
- long use_count() const
- {
- return pi_ != 0 ? pi_->use_count(): 0;
- }
-
- friend inline bool operator== (weak_count const &a, weak_count const &b)
- {
- return a.pi_ == b.pi_;
- }
-
- friend inline bool operator< (weak_count const &a, weak_count const &b)
- {
- return std::less < sp_counted_base * >()(a.pi_, b.pi_);
- }
-
-};
-
-inline shared_count::shared_count(weak_count const &r)
- :
- pi_(r.pi_)
- {
- if(pi_ == 0 || !pi_->add_ref_lock())
- {
- boost::throw_exception(boost::bad_weak_ptr());
- }
- }
-
-}//detail
-
- template < class T > class weak_ptr;
- template < class T > class enable_shared_from_this;
-
-namespace detail {
-
-struct static_cast_tag {
-};
-
-struct const_cast_tag {
-};
-
-struct dynamic_cast_tag {
-};
-
-struct polymorphic_cast_tag {
-};
-
-template < class T >
-struct shared_ptr_traits {
- typedef T & reference;
-};
-
-template <>
-struct shared_ptr_traits < void > {
- typedef void reference;
-};
-
-template <>
-struct shared_ptr_traits < void const > {
- typedef void reference;
-};
-
-template <>
-struct shared_ptr_traits < void volatile > {
- typedef void reference;
-};
-
-template <>
-struct shared_ptr_traits < void const volatile > {
- typedef void reference;
-};
-
- template < class T, class Y > void
sp_enable_shared_from_this(shared_count const &pn,
boost::enable_shared_from_this < T > const *pe, Y const *px)
- {
- if(pe != 0)pe->_internal_weak_this._internal_assign(const_cast
< Y * >(px), pn);
- }
-
- inline void sp_enable_shared_from_this(shared_count const &, ...)
- {
- }
-} //detail
-
-template < class T >
-class shared_ptr {
-
-private:
- typedef shared_ptr < T > this_type;
-
-public:
- typedef T element_type;
- typedef T value_type;
- typedef T * pointer;
- typedef typename detail::shared_ptr_traits < T >::reference reference;
-
- shared_ptr()
- :
- px(0),
- pn()
- {
- }
-
- template < class Y > explicit shared_ptr(Y * p)
- :
- px(p),
- pn(p)
- {
- detail::sp_enable_shared_from_this(pn, p, p);
- }
-
- template < class Y, class D > shared_ptr(Y * p, D d)
- :
- px(p),
- pn(p,d)
- {
- detail::sp_enable_shared_from_this(pn, p, p);
- }
-
- template < class Y > explicit shared_ptr(weak_ptr < Y > const &r)
- :
- pn(r.pn)
- {
- px = r.px;
- }
-
- template < class Y > shared_ptr(shared_ptr < Y > const &r)
- :
- px(r.px),
- pn(r.pn)
- {
- }
-
- template < class Y > shared_ptr(shared_ptr < Y > const &r,
detail::static_cast_tag)
- :
- px(static_cast <element_type *>(r.px)),
- pn(r.pn)
- {
- }
-
- template < class Y > shared_ptr(shared_ptr < Y > const &r,
detail::const_cast_tag )
- :
- px(const_cast <element_type *>(r.px)),
- pn(r.pn)
- {
- }
-
- template < class Y > shared_ptr(shared_ptr < Y > const &r,
detail::dynamic_cast_tag)
- :
- px(dynamic_cast <element_type *>(r.px)),
- pn(r.pn)
- {
- if(px == 0)pn = detail::shared_count();
- }
-
- template < class Y > shared_ptr(shared_ptr < Y > const &r,
detail::polymorphic_cast_tag)
- :
- px(dynamic_cast < element_type * >(r.px)),
- pn(r.pn)
- {
- if(px == 0)boost::throw_exception(std::bad_cast());
- }
-
- template < class Y > explicit shared_ptr(std::auto_ptr < Y > &r)
- :
- px(r.get()),
- pn()
- {
- Y * tmp = r.get();
- pn = detail::shared_count(r);
- detail::sp_enable_shared_from_this(pn, tmp, tmp);
- }
-
- template < class Y > shared_ptr & operator= (shared_ptr < Y > const &r)
- {
- px = r.px;
- pn = r.pn;
- return *this;
- }
-
- template < class Y > shared_ptr & operator= (std::auto_ptr < Y > &r)
- {
- this_type(r).swap(*this);
- return *this;
- }
-
- void reset()
- {
- this_type().swap(*this);
- }
-
- template < class Y > void reset(Y * p)
- {
- ((p == 0 || p != px) ? ((void)0) : assert(p == 0 || p != px ));
- this_type(p).swap(*this);
- }
-
- template < class Y, class D > void reset(Y * p, D d)
- {
- this_type(p, d).swap(*this);
- }
-
- reference operator*() const
- {
- ((px != 0) ? ((void )0) : assert(px != 0));
- return *px;
- }
-
- T * operator->() const
- {
- ((px != 0) ? ((void)0) : assert(px != 0));
- return px;
- }
-
- T * get() const
- {
- return px;
- }
-
- typedef T * this_type::*unspecified_bool_type;
-
- operator unspecified_bool_type() const
- {
- return (px == 0 ? 0 : &this_type::px);
- }
-
- bool operator!() const
- {
- return px == 0;
- }
-
- bool unique() const
- {
- return pn.unique();
- }
-
- long use_count() const
- {
- return pn.use_count();
- }
-
- void swap(shared_ptr < T > &other)
- {
- std::swap(px, other.px);
- pn.swap(other.pn);
- }
-
- template < class Y > bool _internal_less(shared_ptr < Y > const &rhs)
const
- {
- return pn < rhs.pn;
- }
-
- void *_internal_get_deleter(std::type_info const &ti) const
- {
- return pn.get_deleter(ti);
- }
-
-private:
-
- template < class Y > friend class shared_ptr;
- template < class Y > friend class weak_ptr;
- T * px;
- detail::shared_count pn;
-};
-
- template < class T, class U > inline bool operator== (shared_ptr < T >
const &a, shared_ptr < U > const &b)
- {
- return a.get() == b.get();
- }
-
- template < class T, class U > inline bool operator!= (shared_ptr < T >
const &a, shared_ptr < U > const &b)
- {
- return a.get()!= b.get();
- }
-
- template < class T, class U > inline bool operator< (shared_ptr < T >
const &a, shared_ptr < U > const &b)
- {
- return a._internal_less(b);
- }
-
- template < class T > inline void swap(shared_ptr < T > &a, shared_ptr <
T > &b)
- {
- a.swap(b);
- }
-
- template < class T, class U > shared_ptr < T >
static_pointer_cast(shared_ptr < U > const &r)
- {
- return shared_ptr < T > (r, detail::static_cast_tag());
- }
-
- template < class T, class U > shared_ptr < T >
const_pointer_cast(shared_ptr < U > const &r)
- {
- return shared_ptr < T > (r, detail::const_cast_tag());
- }
-
- template < class T, class U > shared_ptr < T > dynamic_pointer_cast
(shared_ptr < U > const &r)
- {
- return shared_ptr < T > (r, detail::dynamic_cast_tag());
- }
-
- template < class T, class U > shared_ptr < T > shared_static_cast
(shared_ptr < U > const &r)
- {
- return shared_ptr < T > (r, detail::static_cast_tag());
- }
-
- template < class T, class U > shared_ptr < T > shared_dynamic_cast
(shared_ptr < U > const &r)
- {
- return shared_ptr < T > (r, detail::dynamic_cast_tag());
- }
-
- template < class T, class U > shared_ptr < T > shared_polymorphic_cast
(shared_ptr < U > const &r)
- {
- return shared_ptr < T > (r, detail::polymorphic_cast_tag());
- }
-
- template < class T, class U > shared_ptr < T >
shared_polymorphic_downcast(shared_ptr < U > const &r)
- {
- ((dynamic_cast < T * >(r.get()) == r.get()) ? ((void)0) :
assert(dynamic_cast < T * >(r.get()) == r.get()));
- return shared_static_cast < T > (r);
- }
-
- template < class T > inline T * get_pointer ( shared_ptr < T > const &p
)
- {
- return p.get();
- }
-
- template < class E, class T, class Y > std::basic_ostream < E, T >
&operator<< ( std::basic_ostream < E, T > &os, shared_ptr < Y > const &p)
- {
- os << p.get();
- return os;
- }
-
- template < class D, class T > D * get_deleter(shared_ptr < T > const &p)
- {
- return static_cast < D * >(p._internal_get_deleter(typeid(D)));
- }
-
-template < class T >
-class shared_array {
-
-private:
-
-typedef checked_array_deleter < T > deleter;
-typedef shared_array < T > this_type;
-
-public:
-
-typedef T element_type;
-
- explicit shared_array(T * p = 0)
- :
- px(p),
- pn(p, deleter())
- {
- }
-
- template < class D > shared_array(T * p, D d)
- :
- px(p),
- pn(p, d)
- {
- }
-
- void reset(T * p = 0)
- {
- ((p == 0 || p != px) ? ((void)0) : assert(p == 0 || p != px));
- this_type(p).swap(*this);
- }
-
- template < class D > void reset(T * p, D d)
- {
- this_type(p, d).swap(*this);
- }
-
- T & operator[](std::ptrdiff_t i) const
- {
- ((px != 0) ? ((void)0) : assert(px != 0));
- ((i >= 0) ? ((void)0) : assert(i >= 0));
- return px[i];
- }
-
- T * get() const
- {
- return px;
- }
-
- typedef T * this_type::*unspecified_bool_type;
-
- operator unspecified_bool_type() const
- {
- return px == 0 ? 0 : &this_type::px;
- }
-
- bool operator!() const
- {
- return px == 0;
- }
-
- bool unique() const
- {
- return pn.unique();
- }
-
- long use_count() const
- {
- return pn.use_count();
- }
-
- void swap(shared_array < T > &other)
- {
- std::swap(px, other.px);
- pn.swap(other.pn);
- }
-
-private:
-
- T * px;
- detail::shared_count pn;
-};
-
- template < class T > inline bool operator== (shared_array < T > const
&a, shared_array < T > const &b)
- {
- return a.get() == b.get();
- }
-
- template < class T > inline bool operator!= (shared_array < T > const
&a, shared_array < T > const &b)
- {
- return a.get()!= b.get();
- }
-
- template < class T > inline bool operator< (shared_array < T > const
&a, shared_array < T > const &b)
- {
- return std::less < T * >()(a.get(), b.get());
- }
-
- template < class T > void swap(shared_array < T > &a, shared_array < T
> &b)
- {
- a.swap(b);
- }
-
-
-template < class T >
-class weak_ptr {
-
-private:
-
- typedef weak_ptr < T > this_type;
-
-public:
-
- typedef T element_type;
-
- weak_ptr():
- px(0),
- pn()
- {
- }
-
- template < class Y > weak_ptr(weak_ptr < Y > const &r)
- :
- pn(r.pn)
- {
- px = r.lock().get();
- }
-
- template < class Y > weak_ptr(shared_ptr < Y > const &r)
- :
- px(r.px),
- pn(r.pn)
- {
- }
-
- template < class Y > weak_ptr & operator= (weak_ptr < Y > const &r)
- {
- px = r.lock().get();
- pn = r.pn;
- return *this;
- }
-
- template < class Y > weak_ptr & operator= (shared_ptr < Y > const &r)
- {
- px = r.px;
- pn = r.pn;
- return *this;
- }
-
- shared_ptr < T > lock() const
- {
- return expired() ? shared_ptr < element_type >() : shared_ptr <
element_type > (*this);
- }
-
- long use_count() const
- {
- return pn.use_count();
- }
-
- bool expired() const
- {
- return pn.use_count() == 0;
- }
-
- void reset()
- {
- this_type().swap(*this);
- }
-
- void swap(this_type & other)
- {
- std::swap(px, other.px);
- pn.swap(other.pn);
- }
-
- void _internal_assign(T * px2, detail::shared_count const &pn2)
- {
- px = px2;
- pn = pn2;
- }
-
- template < class Y > bool _internal_less(weak_ptr < Y > const &rhs)
const
- {
- return pn < rhs.pn;
- }
-
-private:
-
- template < class Y > friend class weak_ptr;
- template < class Y > friend class shared_ptr;
- T * px;
- detail::weak_count pn;
-};
-
- template < class T, class U > inline bool operator< (weak_ptr < T >
const &a, weak_ptr < U > const &b)
- {
- return a._internal_less(b);
- }
-
- template < class T > void swap(weak_ptr < T > &a, weak_ptr < T > &b)
- {
- a.swap(b);
- }
-
- template < class T > shared_ptr < T > make_shared(weak_ptr < T > const
&r)
- {
- return r.lock();
- }
-
-template < class T >
-class intrusive_ptr {
-
-private:
-
- typedef intrusive_ptr this_type;
-
-public:
-
- typedef T element_type;
-
- intrusive_ptr()
- :
- p_(0)
- {
- }
-
- intrusive_ptr(T * p, bool add_ref = true)
- :
- p_(p)
- {
- if(p_ != 0 && add_ref)intrusive_ptr_add_ref(p_);
- }
-
- template < class U > intrusive_ptr(intrusive_ptr < U > const &rhs)
- :
- p_(rhs.get())
- {
- if(p_ != 0)intrusive_ptr_add_ref(p_);
- }
-
- intrusive_ptr(intrusive_ptr const &rhs)
- :
- p_(rhs.p_)
- {
- if(p_ != 0)intrusive_ptr_add_ref(p_);
- }
-
- ~intrusive_ptr()
- {
- if(p_ != 0)intrusive_ptr_release(p_);
- }
-
- template < class U > intrusive_ptr & operator= (intrusive_ptr < U >
const &rhs)
- {
- this_type(rhs).swap(*this);
- return *this;
- }
-
- intrusive_ptr & operator= (intrusive_ptr const &rhs)
- {
- this_type(rhs).swap(*this);
- return *this;
- }
-
- intrusive_ptr & operator= (T * rhs)
- {
- this_type(rhs).swap(*this);
- return *this;
- }
-
- T * get() const
- {
- return p_;
- }
-
- T & operator*() const
- {
- return *p_;
- }
-
- T * operator->() const
- {
- return p_;
- }
-
- typedef T * this_type::*unspecified_bool_type;
-
- operator unspecified_bool_type() const
- {
- return p_ == 0 ? 0 : &this_type::p_;
- }
-
- bool operator!() const
- {
- return p_ == 0;
- }
-
- void swap(intrusive_ptr & rhs)
- {
- T * tmp = p_;
- p_ = rhs.p_;
- rhs.p_ = tmp;
- }
-
-private:
-
- T * p_;
-};
-
- template < class T, class U > inline bool operator== (intrusive_ptr < T
> const &a, intrusive_ptr < U > const &b)
- {
- return a.get() == b.get();
- }
-
- template < class T, class U > inline bool operator!= (intrusive_ptr < T
> const &a, intrusive_ptr < U > const &b)
- {
- return a.get()!= b.get();
- }
-
- template < class T > inline bool operator== (intrusive_ptr < T > const
&a, T * b)
- {
- return a.get() == b;
- }
-
- template < class T > inline bool operator!= (intrusive_ptr < T > const
&a, T * b)
- {
- return a.get()!= b;
- }
-
- template < class T > inline bool operator== (T * a, intrusive_ptr < T >
const &b)
- {
- return a == b.get();
- }
-
- template < class T > inline bool operator!= (T * a, intrusive_ptr < T >
const &b)
- {
- return a != b.get();
- }
-
- template < class T > inline bool operator< (intrusive_ptr < T > const
&a, intrusive_ptr < T > const &b)
- {
- return std::less < T * >()(a.get(), b.get());
- }
-
- template < class T > void swap(intrusive_ptr < T > &lhs, intrusive_ptr
< T > &rhs)
- {
- lhs.swap(rhs);
- }
-
- template < class T > T * get_pointer(intrusive_ptr < T > const &p)
- {
- return p.get();
- }
-
- template < class T, class U > intrusive_ptr < T >
static_pointer_cast(intrusive_ptr < U > const &p)
- {
- return static_cast < T * >(p.get());
- }
-
- template < class T, class U > intrusive_ptr < T >
const_pointer_cast(intrusive_ptr < U > const &p)
- {
- return const_cast < T * >(p.get());
- }
-
- template < class T, class U > intrusive_ptr < T >
dynamic_pointer_cast(intrusive_ptr < U > const &p)
- {
- return dynamic_cast < T * >(p.get());
- }
-
- template < class E, class T, class Y > std::basic_ostream < E, T >
&operator<< ( std::basic_ostream < E, T > &os, intrusive_ptr < Y > const &p)
- {
- os << p.get();
- return os;
- }
-
-template < class T >
-class enable_shared_from_this {
-
-protected:
-
- enable_shared_from_this()
- {
- }
-
- enable_shared_from_this(enable_shared_from_this const &)
- {
- }
-
- enable_shared_from_this & operator= (enable_shared_from_this const &)
- {
- return *this;
- }
-
- ~enable_shared_from_this()
- {
- }
-
-public:
-
- shared_ptr < T > shared_from_this()
- {
- shared_ptr < T > p(_internal_weak_this);
- ((p.get() == this) ? ((void)0) : assert(p.get() == this));
- return p;
- }
-
- shared_ptr < T const >shared_from_this() const
- {
- shared_ptr < T const >p(_internal_weak_this);
- ((p.get() == this) ? ((void)0) : assert(p.get() == this));
- return p;
- }
-
- typedef T _internal_element_type;
- mutable weak_ptr < _internal_element_type > _internal_weak_this;
-};
-} //Boost
-
-#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libbase/smart_ptr.h libbase/sma...,
Markus Gothe <=