equal
deleted
inserted
replaced
111 { |
111 { |
112 NS_ASSERT (CheckLoose ()); |
112 NS_ASSERT (CheckLoose ()); |
113 const Object *currentObject = this; |
113 const Object *currentObject = this; |
114 do { |
114 do { |
115 NS_ASSERT (currentObject != 0); |
115 NS_ASSERT (currentObject != 0); |
116 TypeId cur = currentObject->m_tid; |
116 TypeId cur = currentObject->GetInstanceTypeId (); |
117 while (cur != tid && cur != Object::GetTypeId ()) |
117 while (cur != tid && cur != Object::GetTypeId ()) |
118 { |
118 { |
119 cur = cur.GetParent (); |
119 cur = cur.GetParent (); |
120 } |
120 } |
121 if (cur == tid) |
121 if (cur == tid) |
144 NS_ASSERT (!m_disposed); |
144 NS_ASSERT (!m_disposed); |
145 NS_ASSERT (!o->m_disposed); |
145 NS_ASSERT (!o->m_disposed); |
146 NS_ASSERT (CheckLoose ()); |
146 NS_ASSERT (CheckLoose ()); |
147 NS_ASSERT (o->CheckLoose ()); |
147 NS_ASSERT (o->CheckLoose ()); |
148 |
148 |
149 if (DoGetObject (o->m_tid)) |
149 if (DoGetObject (o->GetInstanceTypeId ())) |
150 { |
150 { |
151 NS_FATAL_ERROR ("Object::AggregateObject(): " |
151 NS_FATAL_ERROR ("Object::AggregateObject(): " |
152 "Multiple aggregation of objects of type " << o->m_tid.GetName ()); |
152 "Multiple aggregation of objects of type " << |
|
153 o->GetInstanceTypeId ().GetName ()); |
153 } |
154 } |
154 |
155 |
155 Object *other = PeekPointer (o); |
156 Object *other = PeekPointer (o); |
156 Object *next = m_next; |
157 Object *next = m_next; |
157 m_next = other->m_next; |
158 m_next = other->m_next; |