author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Thu, 26 Jul 2007 08:18:11 +0200 | |
changeset 970 | e62217592fde |
parent 966 | f06737552914 |
child 1007 | 3838d8b043c0 |
permissions | -rw-r--r-- |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1 |
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
2 |
/* |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
3 |
* Copyright (c) 2005,2006 INRIA |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
4 |
* All rights reserved. |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
5 |
* |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
6 |
* This program is free software; you can redistribute it and/or modify |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
7 |
* it under the terms of the GNU General Public License version 2 as |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
8 |
* published by the Free Software Foundation; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
9 |
* |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
10 |
* This program is distributed in the hope that it will be useful, |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
11 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
12 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
13 |
* GNU General Public License for more details. |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
14 |
* |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
16 |
* along with this program; if not, write to the Free Software |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
17 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
18 |
* |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
19 |
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
20 |
*/ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
21 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
22 |
#ifndef PTR_H |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
23 |
#define PTR_H |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
24 |
|
970
e62217592fde
fix optimized build
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
966
diff
changeset
|
25 |
#include <iostream> |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
26 |
#include <stdint.h> |
286
57e6a2006962
convert use of <cassert> to "ns3/assert.h"
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
227
diff
changeset
|
27 |
#include "assert.h" |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
28 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
29 |
namespace ns3 { |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
30 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
31 |
/** |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
32 |
* \brief smart pointer class similar to boost::intrusive_ptr |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
33 |
* |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
34 |
* This smart-pointer class assumes that the underlying |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
35 |
* type provides a pair of Ref and Unref methods which are |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
36 |
* expected to increment and decrement the internal refcount |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
37 |
* of the object instance. |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
38 |
* |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
39 |
* This implementation allows you to manipulate the smart pointer |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
40 |
* as if it was a normal pointer: you can compare it with zero, |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
41 |
* compare it against other pointers, assign zero to it, etc. |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
42 |
* |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
43 |
* It is possible to extract the raw pointer from this |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
44 |
* smart pointer with the GetPointer and PeekPointer methods. |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
45 |
* |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
46 |
* If you want to store a newed object into a smart pointer, |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
47 |
* we recommend you to use the Create template functions |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
48 |
* to create the object and store it in a smart pointer to avoid |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
49 |
* memory leaks. These functions are really small conveniance |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
50 |
* functions and their goal is just is save you a small |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
51 |
* bit of typing. |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
52 |
*/ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
53 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
54 |
class Ptr |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
55 |
{ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
56 |
private: |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
57 |
T *m_ptr; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
58 |
class Tester { |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
59 |
private: |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
60 |
void operator delete (void *); |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
61 |
}; |
225
dad23ccd9e6c
more tests, fix bugs uncovered by tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
223
diff
changeset
|
62 |
friend class Ptr<const T>; |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
63 |
template <typename U> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
64 |
friend U *GetPointer (const Ptr<U> &p); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
65 |
template <typename U> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
66 |
friend U *PeekPointer (const Ptr<U> &p); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
67 |
|
567
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
68 |
void Acquire (void) const; |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
69 |
public: |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
70 |
/** |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
71 |
* Create an empty smart pointer |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
72 |
*/ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
73 |
Ptr (); |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
74 |
/** |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
75 |
* \param ptr raw pointer to manage |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
76 |
* |
664
b6aed9871c69
Correct the Ptr (T *ptr) documentation.
Gustavo J. A. M. Carneiro <gjcarneiro@gmail.com>
parents:
640
diff
changeset
|
77 |
* Create a smart pointer which points to the object pointed to by |
b6aed9871c69
Correct the Ptr (T *ptr) documentation.
Gustavo J. A. M. Carneiro <gjcarneiro@gmail.com>
parents:
640
diff
changeset
|
78 |
* the input raw pointer ptr. This method creates its own reference |
b6aed9871c69
Correct the Ptr (T *ptr) documentation.
Gustavo J. A. M. Carneiro <gjcarneiro@gmail.com>
parents:
640
diff
changeset
|
79 |
* to the pointed object. The caller is responsible for Unref()'ing |
b6aed9871c69
Correct the Ptr (T *ptr) documentation.
Gustavo J. A. M. Carneiro <gjcarneiro@gmail.com>
parents:
640
diff
changeset
|
80 |
* its own reference, and the smart pointer will eventually do the |
b6aed9871c69
Correct the Ptr (T *ptr) documentation.
Gustavo J. A. M. Carneiro <gjcarneiro@gmail.com>
parents:
640
diff
changeset
|
81 |
* same, so that object is deleted if no more references to it |
b6aed9871c69
Correct the Ptr (T *ptr) documentation.
Gustavo J. A. M. Carneiro <gjcarneiro@gmail.com>
parents:
640
diff
changeset
|
82 |
* remain. |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
83 |
*/ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
84 |
Ptr (T *ptr); |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
85 |
Ptr (Ptr const&o); |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
86 |
// allow conversions from T to T const. |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
87 |
template <typename U> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
88 |
Ptr (Ptr<U> const &o); |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
89 |
~Ptr () ; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
90 |
Ptr<T> &operator = (Ptr const& o); |
544
cbc4158d47c9
remove ptr::Remove, make ptr::Peek share the same signature as ptr::Get
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
543
diff
changeset
|
91 |
|
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
92 |
T *operator -> () const; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
93 |
T *operator -> (); |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
94 |
// allow if (!sp) |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
95 |
bool operator! (); |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
96 |
// allow if (sp) |
574
c1938b405c09
add small comment
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
573
diff
changeset
|
97 |
// disable delete sp |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
98 |
operator Tester * () const; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
99 |
}; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
100 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
101 |
template <typename T> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
102 |
Ptr<T> Create (void); |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
103 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
104 |
template <typename T, typename T1> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
105 |
Ptr<T> Create (T1 a1); |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
106 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
107 |
template <typename T, typename T1, typename T2> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
108 |
Ptr<T> Create (T1 a1, T2 a2); |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
109 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
110 |
template <typename T, typename T1, typename T2, typename T3> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
111 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3); |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
112 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
113 |
template <typename T, typename T1, typename T2, typename T3, typename T4> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
114 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3, T4 a4); |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
115 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
116 |
template <typename T, typename T1, typename T2, typename T3, typename T4, typename T5> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
117 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5); |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
118 |
|
570
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
119 |
template <typename T, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
120 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6); |
570
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
121 |
|
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
122 |
template <typename T, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
123 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7); |
570
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
124 |
|
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
125 |
/** |
640
028db47a657f
beautify the dox output
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
574
diff
changeset
|
126 |
* \relates Ptr |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
127 |
* \return the pointer managed by this smart pointer. |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
128 |
* |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
129 |
* The underlying refcount is not incremented prior |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
130 |
* to returning to the caller so the caller is not |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
131 |
* responsible for calling Unref himself. |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
132 |
*/ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
133 |
template <typename T> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
134 |
T * PeekPointer (const Ptr<T> &p); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
135 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
136 |
/** |
640
028db47a657f
beautify the dox output
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
574
diff
changeset
|
137 |
* \relates Ptr |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
138 |
* \return the pointer managed by this smart pointer. |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
139 |
* |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
140 |
* The underlying refcount is incremented prior |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
141 |
* to returning to the caller so the caller is |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
142 |
* responsible for calling Unref himself. |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
143 |
*/ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
144 |
template <typename T> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
145 |
T * GetPointer (const Ptr<T> &p); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
146 |
|
966
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
147 |
template <typename T> |
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
148 |
std::ostream &operator << (std::ostream &, const Ptr<T> &p); |
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
149 |
|
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
150 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
151 |
// allow if (sp == 0) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
152 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
153 |
bool operator == (Ptr<T1> const &lhs, T2 const *rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
154 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
155 |
// allow if (0 == sp) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
156 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
157 |
bool operator == (T1 const *lhs, Ptr<T2> &rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
158 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
159 |
// allow if (sp != 0) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
160 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
161 |
bool operator != (Ptr<T1> const &lhs, T2 const *rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
162 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
163 |
// allow if (0 != sp) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
164 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
165 |
bool operator != (T1 const *lhs, Ptr<T2> &rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
166 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
167 |
// allow if (sp0 == sp1) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
168 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
169 |
bool operator == (Ptr<T1> const &lhs, Ptr<T2> const &rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
170 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
171 |
// allow if (sp0 != sp1) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
172 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
173 |
bool operator != (Ptr<T1> const &lhs, Ptr<T2> const &rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
174 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
175 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
176 |
Ptr<T1> const_pointer_cast (Ptr<T2> const&p); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
177 |
|
685 | 178 |
template <typename T> |
179 |
struct CallbackTraits; |
|
180 |
||
181 |
template <typename T> |
|
182 |
struct CallbackTraits<Ptr<T> > |
|
183 |
{ |
|
184 |
static T & GetReference (Ptr<T> const p) |
|
185 |
{ |
|
689
49bccd847179
add tests and fix leak
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
685
diff
changeset
|
186 |
return *PeekPointer (p); |
685 | 187 |
} |
188 |
}; |
|
189 |
||
690 | 190 |
template <typename T> |
946
f589f6cf42ca
rename traits to handle Ptr<> object pointers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
191 |
struct EventMemberImplObjTraits; |
690 | 192 |
|
193 |
template <typename T> |
|
946
f589f6cf42ca
rename traits to handle Ptr<> object pointers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
194 |
struct EventMemberImplObjTraits<Ptr<T> > |
690 | 195 |
{ |
196 |
static T &GetReference (Ptr<T> p) { |
|
197 |
return *PeekPointer (p); |
|
198 |
} |
|
199 |
}; |
|
200 |
||
685 | 201 |
|
689
49bccd847179
add tests and fix leak
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
685
diff
changeset
|
202 |
|
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
203 |
} // namespace ns3 |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
204 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
205 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
206 |
namespace ns3 { |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
207 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
208 |
/************************************************* |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
209 |
* friend non-member function implementations |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
210 |
************************************************/ |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
211 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
212 |
template <typename T> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
213 |
Ptr<T> Create (void) |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
214 |
{ |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
215 |
T *obj = new T (); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
216 |
Ptr<T> p = obj; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
217 |
obj->Unref (); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
218 |
return p; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
219 |
} |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
220 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
221 |
template <typename T, typename T1> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
222 |
Ptr<T> Create (T1 a1) |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
223 |
{ |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
224 |
T *obj = new T (a1); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
225 |
Ptr<T> p = obj; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
226 |
obj->Unref (); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
227 |
return p; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
228 |
} |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
229 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
230 |
template <typename T, typename T1, typename T2> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
231 |
Ptr<T> Create (T1 a1, T2 a2) |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
232 |
{ |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
233 |
T *obj = new T (a1, a2); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
234 |
Ptr<T> p = obj; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
235 |
obj->Unref (); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
236 |
return p; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
237 |
} |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
238 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
239 |
template <typename T, typename T1, typename T2, typename T3> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
240 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3) |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
241 |
{ |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
242 |
T *obj = new T (a1, a2, a3); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
243 |
Ptr<T> p = obj; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
244 |
obj->Unref (); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
245 |
return p; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
246 |
} |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
247 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
248 |
template <typename T, typename T1, typename T2, typename T3, typename T4> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
249 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3, T4 a4) |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
250 |
{ |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
251 |
T *obj = new T (a1, a2, a3, a4); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
252 |
Ptr<T> p = obj; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
253 |
obj->Unref (); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
254 |
return p; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
255 |
} |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
256 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
257 |
template <typename T, typename T1, typename T2, typename T3, typename T4, typename T5> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
258 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5) |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
259 |
{ |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
260 |
T *obj = new T (a1, a2, a3, a4, a5); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
261 |
Ptr<T> p = obj; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
262 |
obj->Unref (); |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
263 |
return p; |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
264 |
} |
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
265 |
|
570
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
266 |
template <typename T, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
267 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6) |
570
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
268 |
{ |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
269 |
T *obj = new T (a1, a2, a3, a4, a5, a6); |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
270 |
Ptr<T> p = obj; |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
271 |
obj->Unref (); |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
272 |
return p; |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
273 |
} |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
274 |
|
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
275 |
template <typename T, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
690
diff
changeset
|
276 |
Ptr<T> Create (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7) |
570
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
277 |
{ |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
278 |
T *obj = new T (a1, a2, a3, a4, a5, a6, a7); |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
279 |
Ptr<T> p = obj; |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
280 |
obj->Unref (); |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
281 |
return p; |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
282 |
} |
cc38d7fae91e
add MakeNewObject template with more arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
569
diff
changeset
|
283 |
|
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
284 |
template <typename T> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
285 |
T * PeekPointer (const Ptr<T> &p) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
286 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
287 |
return p.m_ptr; |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
288 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
289 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
290 |
template <typename T> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
291 |
T * GetPointer (const Ptr<T> &p) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
292 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
293 |
p.Acquire (); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
294 |
return p.m_ptr; |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
295 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
296 |
|
966
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
297 |
template <typename T> |
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
298 |
std::ostream &operator << (std::ostream &os, const Ptr<T> &p) |
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
299 |
{ |
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
300 |
os << PeekPointer (p); |
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
301 |
return os; |
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
302 |
} |
f06737552914
add operator << (std::ostream)for Ptr<T>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
946
diff
changeset
|
303 |
|
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
304 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
305 |
bool |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
306 |
operator == (Ptr<T1> const &lhs, T2 const *rhs) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
307 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
308 |
return PeekPointer (lhs) == rhs; |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
309 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
310 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
311 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
312 |
bool |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
313 |
operator == (T1 const *lhs, Ptr<T2> &rhs) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
314 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
315 |
return lhs == PeekPointer (rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
316 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
317 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
318 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
319 |
bool |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
320 |
operator != (Ptr<T1> const &lhs, T2 const *rhs) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
321 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
322 |
return PeekPointer (lhs) != rhs; |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
323 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
324 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
325 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
326 |
bool |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
327 |
operator != (T1 const *lhs, Ptr<T2> &rhs) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
328 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
329 |
return lhs != PeekPointer (rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
330 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
331 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
332 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
333 |
bool |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
334 |
operator == (Ptr<T1> const &lhs, Ptr<T2> const &rhs) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
335 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
336 |
return PeekPointer (lhs) == PeekPointer (rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
337 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
338 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
339 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
340 |
bool |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
341 |
operator != (Ptr<T1> const &lhs, Ptr<T2> const &rhs) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
342 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
343 |
return PeekPointer (lhs) != PeekPointer (rhs); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
344 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
345 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
346 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
347 |
template <typename T1, typename T2> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
348 |
Ptr<T1> |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
349 |
const_pointer_cast (Ptr<T2> const&p) |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
350 |
{ |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
351 |
return Ptr<T1> (const_cast<T1 *> (PeekPointer (p))); |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
352 |
} |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
353 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
354 |
|
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
355 |
/**************************************************** |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
356 |
* Member method implementations. |
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
357 |
***************************************************/ |
569
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
358 |
|
31a7c6fc511e
add MakeNewObject template function and fix operator == (T1,T2)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
567
diff
changeset
|
359 |
template <typename T> |
567
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
360 |
void |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
361 |
Ptr<T>::Acquire (void) const |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
362 |
{ |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
363 |
if (m_ptr != 0) |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
364 |
{ |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
365 |
m_ptr->Ref (); |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
366 |
} |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
367 |
} |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
368 |
|
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
369 |
template <typename T> |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
370 |
Ptr<T>::Ptr () |
542
00722b9a01b3
Ptr changed to use Object's refcounts
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
432
diff
changeset
|
371 |
: m_ptr (0) |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
372 |
{} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
373 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
374 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
375 |
Ptr<T>::Ptr (T *ptr) |
542
00722b9a01b3
Ptr changed to use Object's refcounts
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
432
diff
changeset
|
376 |
: m_ptr (ptr) |
567
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
377 |
{ |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
378 |
Acquire (); |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
379 |
} |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
380 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
381 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
382 |
Ptr<T>::Ptr (Ptr const&o) |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
383 |
: m_ptr (PeekPointer (o)) |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
384 |
{ |
567
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
385 |
Acquire (); |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
386 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
387 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
388 |
template <typename U> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
389 |
Ptr<T>::Ptr (Ptr<U> const &o) |
573
0da9201a048e
rename Ptr::Get and Ptr::Peek to GetPointer and PeekPointer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
570
diff
changeset
|
390 |
: m_ptr (PeekPointer (o)) |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
391 |
{ |
567
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
392 |
Acquire (); |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
393 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
394 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
395 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
396 |
Ptr<T>::~Ptr () |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
397 |
{ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
398 |
if (m_ptr != 0) |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
399 |
{ |
542
00722b9a01b3
Ptr changed to use Object's refcounts
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
432
diff
changeset
|
400 |
m_ptr->Unref(); |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
401 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
402 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
403 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
404 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
405 |
Ptr<T> & |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
406 |
Ptr<T>::operator = (Ptr const& o) |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
407 |
{ |
426
7d0bde915fd6
Fix Ptr<T>::m_count memory leak in some places.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
286
diff
changeset
|
408 |
if (&o == this) |
567
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
409 |
{ |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
410 |
return *this; |
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
411 |
} |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
412 |
if (m_ptr != 0) |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
413 |
{ |
542
00722b9a01b3
Ptr changed to use Object's refcounts
Raj Bhattacharjea <raj.b@gatech.edu>
parents:
432
diff
changeset
|
414 |
m_ptr->Unref(); |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
415 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
416 |
m_ptr = o.m_ptr; |
567
6fb98941c36f
remove leaks and rework the Ptr class to work with a new refcount mechanism
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
544
diff
changeset
|
417 |
Acquire (); |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
418 |
return *this; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
419 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
420 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
421 |
template <typename T> |
544
cbc4158d47c9
remove ptr::Remove, make ptr::Peek share the same signature as ptr::Get
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
543
diff
changeset
|
422 |
T * |
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
423 |
Ptr<T>::operator -> () |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
424 |
{ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
425 |
return m_ptr; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
426 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
427 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
428 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
429 |
T * |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
430 |
Ptr<T>::operator -> () const |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
431 |
{ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
432 |
return m_ptr; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
433 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
434 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
435 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
436 |
bool |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
437 |
Ptr<T>::operator! () |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
438 |
{ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
439 |
return m_ptr == 0; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
440 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
441 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
442 |
template <typename T> |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
443 |
Ptr<T>::operator Tester * () const |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
444 |
{ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
445 |
if (m_ptr == 0) |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
446 |
{ |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
447 |
return 0; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
448 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
449 |
static Tester test; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
450 |
return &test; |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
451 |
} |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
452 |
|
225
dad23ccd9e6c
more tests, fix bugs uncovered by tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
223
diff
changeset
|
453 |
|
223
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
454 |
}; // namespace ns3 |
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
455 |
|
80f1c6b76999
initial go at smart pointer implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
456 |
#endif /* PTR_H */ |