View | Details | Raw Unified | Return to bug 1939
Collapse All | Expand All

(-)a/src/core/model/object.cc (-1 / +6 lines)
 Lines 274-279   Object::AggregateObject (Ptr<Object> o) Link Here 
274
  for (uint32_t i = 0; i < other->m_aggregates->n; i++)
274
  for (uint32_t i = 0; i < other->m_aggregates->n; i++)
275
    {
275
    {
276
      aggregates->buffer[m_aggregates->n+i] = other->m_aggregates->buffer[i];
276
      aggregates->buffer[m_aggregates->n+i] = other->m_aggregates->buffer[i];
277
      if (DoGetObject (other->m_aggregates->buffer[i]->GetInstanceTypeId ()))
278
        {
279
          NS_FATAL_ERROR ("Object::AggregateObject(): "
280
                          "Multiple aggregation of objects of type " <<
281
                          other->m_aggregates->buffer[i]->GetInstanceTypeId ());
282
        }
277
      UpdateSortedArray (aggregates, m_aggregates->n + i);
283
      UpdateSortedArray (aggregates, m_aggregates->n + i);
278
    }
284
    }
279
285
280
- 

Return to bug 1939