merge with HEAD
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Thu Aug 07 11:14:32 2008 -0700 (18 months ago)
changeset 3534e101960f06de
parent 3533 5ba130a7f519
parent 3532 dacc57c5d31f
child 3535 a6113320f46a
merge with HEAD
     1.1 --- a/bindings/python/ns3_module_node.py	Thu Aug 07 11:14:15 2008 -0700
     1.2 +++ b/bindings/python/ns3_module_node.py	Thu Aug 07 11:14:32 2008 -0700
     1.3 @@ -1671,10 +1671,6 @@
     1.4                     'ns3::Ptr< ns3::Application >', 
     1.5                     [param('uint32_t', 'index')], 
     1.6                     is_const=True)
     1.7 -    ## node.h: ns3::Ptr<ns3::Application> ns3::Node::GetFirstApplication(ns3::TypeId tid) [member function]
     1.8 -    cls.add_method('GetFirstApplication', 
     1.9 -                   'ns3::Ptr< ns3::Application >', 
    1.10 -                   [param('ns3::TypeId', 'tid')])
    1.11      ## node.h: uint32_t ns3::Node::GetNApplications() const [member function]
    1.12      cls.add_method('GetNApplications', 
    1.13                     'uint32_t', 
     2.1 --- a/src/node/node.cc	Thu Aug 07 11:14:15 2008 -0700
     2.2 +++ b/src/node/node.cc	Thu Aug 07 11:14:32 2008 -0700
     2.3 @@ -136,18 +136,6 @@
     2.4  {
     2.5    return m_applications.size ();
     2.6  }
     2.7 -Ptr<Application>
     2.8 -Node::GetFirstApplication(TypeId tid)
     2.9 -{
    2.10 -  for (std::vector<Ptr<Application> >::iterator i = m_applications.begin ();
    2.11 -       i != m_applications.end (); i++) {
    2.12 -    Ptr<Application> app = *i;
    2.13 -    if (app->GetInstanceTypeId() == tid)
    2.14 -      return app;
    2.15 -  }
    2.16 -
    2.17 -  return 0;
    2.18 -}
    2.19  
    2.20  void 
    2.21  Node::DoDispose()
     3.1 --- a/src/node/node.h	Thu Aug 07 11:14:15 2008 -0700
     3.2 +++ b/src/node/node.h	Thu Aug 07 11:14:32 2008 -0700
     3.3 @@ -122,12 +122,6 @@
     3.4     *          within this Node.
     3.5     */
     3.6    Ptr<Application> GetApplication (uint32_t index) const;
     3.7 -  /**
     3.8 -   * \param index
     3.9 -   * \returns the application associated to this requested index
    3.10 -   *          within this Node.
    3.11 -   */
    3.12 -  Ptr<Application> GetFirstApplication (TypeId tid);
    3.13  
    3.14    /**
    3.15     * \returns the number of applications associated to this Node.