Python: new pybindgen, rescan API definitions, new API definition files are more multi-line and hopefully easier to read
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Mon, 21 Jul 2008 15:30:15 +0100
changeset 34680bb5275704fc
parent 3467 351f5847dda5
child 3472 190ce8107098
Python: new pybindgen, rescan API definitions, new API definition files are more multi-line and hopefully easier to read
bindings/python/ns3_module_bridge.py
bindings/python/ns3_module_common.py
bindings/python/ns3_module_contrib.py
bindings/python/ns3_module_core.py
bindings/python/ns3_module_csma.py
bindings/python/ns3_module_global_routing.py
bindings/python/ns3_module_helper.py
bindings/python/ns3_module_internet_stack.py
bindings/python/ns3_module_mobility.py
bindings/python/ns3_module_node.py
bindings/python/ns3_module_olsr.py
bindings/python/ns3_module_onoff.py
bindings/python/ns3_module_packet_sink.py
bindings/python/ns3_module_point_to_point.py
bindings/python/ns3_module_simulator.py
bindings/python/ns3_module_udp_echo.py
bindings/python/ns3_module_wifi.py
bindings/python/ns3modulegen_generated.py
bindings/python/wscript
     1.1 --- a/bindings/python/ns3_module_bridge.py	Mon Jul 21 11:43:05 2008 +0100
     1.2 +++ b/bindings/python/ns3_module_bridge.py	Mon Jul 21 15:30:15 2008 +0100
     1.3 @@ -1,4 +1,4 @@
     1.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     1.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     1.6  
     1.7  def register_types(module):
     1.8      root_module = module.get_root()
     1.9 @@ -55,84 +55,190 @@
    1.10  
    1.11  def register_Ns3BridgeNetDevice_methods(root_module, cls):
    1.12      ## bridge-net-device.h: static ns3::TypeId ns3::BridgeNetDevice::GetTypeId() [member function]
    1.13 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
    1.14 +    cls.add_method('GetTypeId', 
    1.15 +                   'ns3::TypeId', 
    1.16 +                   [], 
    1.17 +                   is_static=True)
    1.18      ## bridge-net-device.h: ns3::BridgeNetDevice::BridgeNetDevice() [constructor]
    1.19 -    cls.add_constructor([], visibility='public')
    1.20 +    cls.add_constructor([])
    1.21      ## bridge-net-device.h: void ns3::BridgeNetDevice::AddBridgePort(ns3::Ptr<ns3::NetDevice> bridgePort) [member function]
    1.22 -    cls.add_method('AddBridgePort', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'bridgePort')])
    1.23 +    cls.add_method('AddBridgePort', 
    1.24 +                   'void', 
    1.25 +                   [param('ns3::Ptr< ns3::NetDevice >', 'bridgePort')])
    1.26      ## bridge-net-device.h: void ns3::BridgeNetDevice::SetName(std::string const name) [member function]
    1.27 -    cls.add_method('SetName', 'void', [param('std::string', 'name', is_const=True)], is_virtual=True)
    1.28 +    cls.add_method('SetName', 
    1.29 +                   'void', 
    1.30 +                   [param('std::string', 'name', is_const=True)], 
    1.31 +                   is_virtual=True)
    1.32      ## bridge-net-device.h: std::string ns3::BridgeNetDevice::GetName() const [member function]
    1.33 -    cls.add_method('GetName', 'std::string', [], is_const=True, is_virtual=True)
    1.34 +    cls.add_method('GetName', 
    1.35 +                   'std::string', 
    1.36 +                   [], 
    1.37 +                   is_const=True, is_virtual=True)
    1.38      ## bridge-net-device.h: void ns3::BridgeNetDevice::SetIfIndex(uint32_t const index) [member function]
    1.39 -    cls.add_method('SetIfIndex', 'void', [param('uint32_t', 'index', is_const=True)], is_virtual=True)
    1.40 +    cls.add_method('SetIfIndex', 
    1.41 +                   'void', 
    1.42 +                   [param('uint32_t', 'index', is_const=True)], 
    1.43 +                   is_virtual=True)
    1.44      ## bridge-net-device.h: uint32_t ns3::BridgeNetDevice::GetIfIndex() const [member function]
    1.45 -    cls.add_method('GetIfIndex', 'uint32_t', [], is_const=True, is_virtual=True)
    1.46 +    cls.add_method('GetIfIndex', 
    1.47 +                   'uint32_t', 
    1.48 +                   [], 
    1.49 +                   is_const=True, is_virtual=True)
    1.50      ## bridge-net-device.h: ns3::Ptr<ns3::Channel> ns3::BridgeNetDevice::GetChannel() const [member function]
    1.51 -    cls.add_method('GetChannel', 'ns3::Ptr< ns3::Channel >', [], is_const=True, is_virtual=True)
    1.52 +    cls.add_method('GetChannel', 
    1.53 +                   'ns3::Ptr< ns3::Channel >', 
    1.54 +                   [], 
    1.55 +                   is_const=True, is_virtual=True)
    1.56      ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::GetAddress() const [member function]
    1.57 -    cls.add_method('GetAddress', 'ns3::Address', [], is_const=True, is_virtual=True)
    1.58 +    cls.add_method('GetAddress', 
    1.59 +                   'ns3::Address', 
    1.60 +                   [], 
    1.61 +                   is_const=True, is_virtual=True)
    1.62      ## bridge-net-device.h: bool ns3::BridgeNetDevice::SetMtu(uint16_t const mtu) [member function]
    1.63 -    cls.add_method('SetMtu', 'bool', [param('uint16_t', 'mtu', is_const=True)], is_virtual=True)
    1.64 +    cls.add_method('SetMtu', 
    1.65 +                   'bool', 
    1.66 +                   [param('uint16_t', 'mtu', is_const=True)], 
    1.67 +                   is_virtual=True)
    1.68      ## bridge-net-device.h: uint16_t ns3::BridgeNetDevice::GetMtu() const [member function]
    1.69 -    cls.add_method('GetMtu', 'uint16_t', [], is_const=True, is_virtual=True)
    1.70 +    cls.add_method('GetMtu', 
    1.71 +                   'uint16_t', 
    1.72 +                   [], 
    1.73 +                   is_const=True, is_virtual=True)
    1.74      ## bridge-net-device.h: bool ns3::BridgeNetDevice::IsLinkUp() const [member function]
    1.75 -    cls.add_method('IsLinkUp', 'bool', [], is_const=True, is_virtual=True)
    1.76 +    cls.add_method('IsLinkUp', 
    1.77 +                   'bool', 
    1.78 +                   [], 
    1.79 +                   is_const=True, is_virtual=True)
    1.80      ## bridge-net-device.h: void ns3::BridgeNetDevice::SetLinkChangeCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
    1.81 -    cls.add_method('SetLinkChangeCallback', 'void', [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], is_virtual=True)
    1.82 +    cls.add_method('SetLinkChangeCallback', 
    1.83 +                   'void', 
    1.84 +                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
    1.85 +                   is_virtual=True)
    1.86      ## bridge-net-device.h: bool ns3::BridgeNetDevice::IsBroadcast() const [member function]
    1.87 -    cls.add_method('IsBroadcast', 'bool', [], is_const=True, is_virtual=True)
    1.88 +    cls.add_method('IsBroadcast', 
    1.89 +                   'bool', 
    1.90 +                   [], 
    1.91 +                   is_const=True, is_virtual=True)
    1.92      ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::GetBroadcast() const [member function]
    1.93 -    cls.add_method('GetBroadcast', 'ns3::Address', [], is_const=True, is_virtual=True)
    1.94 +    cls.add_method('GetBroadcast', 
    1.95 +                   'ns3::Address', 
    1.96 +                   [], 
    1.97 +                   is_const=True, is_virtual=True)
    1.98      ## bridge-net-device.h: bool ns3::BridgeNetDevice::IsMulticast() const [member function]
    1.99 -    cls.add_method('IsMulticast', 'bool', [], is_const=True, is_virtual=True)
   1.100 +    cls.add_method('IsMulticast', 
   1.101 +                   'bool', 
   1.102 +                   [], 
   1.103 +                   is_const=True, is_virtual=True)
   1.104      ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::GetMulticast() const [member function]
   1.105 -    cls.add_method('GetMulticast', 'ns3::Address', [], is_const=True, is_virtual=True)
   1.106 +    cls.add_method('GetMulticast', 
   1.107 +                   'ns3::Address', 
   1.108 +                   [], 
   1.109 +                   is_const=True, is_virtual=True)
   1.110      ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::MakeMulticastAddress(ns3::Ipv4Address multicastGroup) const [member function]
   1.111 -    cls.add_method('MakeMulticastAddress', 'ns3::Address', [param('ns3::Ipv4Address', 'multicastGroup')], is_const=True, is_virtual=True)
   1.112 +    cls.add_method('MakeMulticastAddress', 
   1.113 +                   'ns3::Address', 
   1.114 +                   [param('ns3::Ipv4Address', 'multicastGroup')], 
   1.115 +                   is_const=True, is_virtual=True)
   1.116      ## bridge-net-device.h: bool ns3::BridgeNetDevice::IsPointToPoint() const [member function]
   1.117 -    cls.add_method('IsPointToPoint', 'bool', [], is_const=True, is_virtual=True)
   1.118 +    cls.add_method('IsPointToPoint', 
   1.119 +                   'bool', 
   1.120 +                   [], 
   1.121 +                   is_const=True, is_virtual=True)
   1.122      ## bridge-net-device.h: bool ns3::BridgeNetDevice::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
   1.123 -    cls.add_method('Send', 'bool', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True)
   1.124 +    cls.add_method('Send', 
   1.125 +                   'bool', 
   1.126 +                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], 
   1.127 +                   is_virtual=True)
   1.128      ## bridge-net-device.h: bool ns3::BridgeNetDevice::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
   1.129 -    cls.add_method('SendFrom', 'bool', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True)
   1.130 +    cls.add_method('SendFrom', 
   1.131 +                   'bool', 
   1.132 +                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], 
   1.133 +                   is_virtual=True)
   1.134      ## bridge-net-device.h: ns3::Ptr<ns3::Node> ns3::BridgeNetDevice::GetNode() const [member function]
   1.135 -    cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True)
   1.136 +    cls.add_method('GetNode', 
   1.137 +                   'ns3::Ptr< ns3::Node >', 
   1.138 +                   [], 
   1.139 +                   is_const=True, is_virtual=True)
   1.140      ## bridge-net-device.h: void ns3::BridgeNetDevice::SetNode(ns3::Ptr<ns3::Node> node) [member function]
   1.141 -    cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_virtual=True)
   1.142 +    cls.add_method('SetNode', 
   1.143 +                   'void', 
   1.144 +                   [param('ns3::Ptr< ns3::Node >', 'node')], 
   1.145 +                   is_virtual=True)
   1.146      ## bridge-net-device.h: bool ns3::BridgeNetDevice::NeedsArp() const [member function]
   1.147 -    cls.add_method('NeedsArp', 'bool', [], is_const=True, is_virtual=True)
   1.148 +    cls.add_method('NeedsArp', 
   1.149 +                   'bool', 
   1.150 +                   [], 
   1.151 +                   is_const=True, is_virtual=True)
   1.152      ## bridge-net-device.h: void ns3::BridgeNetDevice::SetReceiveCallback(ns3::Callback<bool, ns3::Ptr<ns3::NetDevice>, ns3::Ptr<ns3::Packet>, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> cb) [member function]
   1.153 -    cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], is_virtual=True)
   1.154 +    cls.add_method('SetReceiveCallback', 
   1.155 +                   'void', 
   1.156 +                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], 
   1.157 +                   is_virtual=True)
   1.158      ## bridge-net-device.h: void ns3::BridgeNetDevice::SetPromiscReceiveCallback(ns3::Callback<bool, ns3::Ptr<ns3::NetDevice>, ns3::Ptr<ns3::Packet>, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function]
   1.159 -    cls.add_method('SetPromiscReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], is_virtual=True)
   1.160 +    cls.add_method('SetPromiscReceiveCallback', 
   1.161 +                   'void', 
   1.162 +                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], 
   1.163 +                   is_virtual=True)
   1.164      ## bridge-net-device.h: bool ns3::BridgeNetDevice::SupportsPromiscuous() const [member function]
   1.165 -    cls.add_method('SupportsPromiscuous', 'bool', [], is_const=True, is_virtual=True)
   1.166 +    cls.add_method('SupportsPromiscuous', 
   1.167 +                   'bool', 
   1.168 +                   [], 
   1.169 +                   is_const=True, is_virtual=True)
   1.170      ## bridge-net-device.h: void ns3::BridgeNetDevice::DoDispose() [member function]
   1.171 -    cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True)
   1.172 +    cls.add_method('DoDispose', 
   1.173 +                   'void', 
   1.174 +                   [], 
   1.175 +                   visibility='protected', is_virtual=True)
   1.176      ## bridge-net-device.h: void ns3::BridgeNetDevice::ReceiveFromDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet> packet, uint16_t protocol, ns3::Address const & source, ns3::Address const & destination, ns3::NetDevice::PacketType packetType) [member function]
   1.177 -    cls.add_method('ReceiveFromDevice', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address&', 'source', is_const=True), param('ns3::Address&', 'destination', is_const=True), param('ns3::NetDevice::PacketType', 'packetType')], visibility='protected')
   1.178 +    cls.add_method('ReceiveFromDevice', 
   1.179 +                   'void', 
   1.180 +                   [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address&', 'source', is_const=True), param('ns3::Address&', 'destination', is_const=True), param('ns3::NetDevice::PacketType', 'packetType')], 
   1.181 +                   visibility='protected')
   1.182      ## bridge-net-device.h: void ns3::BridgeNetDevice::ForwardUnicast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<ns3::Packet> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
   1.183 -    cls.add_method('ForwardUnicast', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], visibility='protected')
   1.184 +    cls.add_method('ForwardUnicast', 
   1.185 +                   'void', 
   1.186 +                   [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], 
   1.187 +                   visibility='protected')
   1.188      ## bridge-net-device.h: void ns3::BridgeNetDevice::ForwardBroadcast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<ns3::Packet> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
   1.189 -    cls.add_method('ForwardBroadcast', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], visibility='protected')
   1.190 +    cls.add_method('ForwardBroadcast', 
   1.191 +                   'void', 
   1.192 +                   [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], 
   1.193 +                   visibility='protected')
   1.194      ## bridge-net-device.h: void ns3::BridgeNetDevice::Learn(ns3::Mac48Address source, ns3::Ptr<ns3::NetDevice> port) [member function]
   1.195 -    cls.add_method('Learn', 'void', [param('ns3::Mac48Address', 'source'), param('ns3::Ptr< ns3::NetDevice >', 'port')], visibility='protected')
   1.196 +    cls.add_method('Learn', 
   1.197 +                   'void', 
   1.198 +                   [param('ns3::Mac48Address', 'source'), param('ns3::Ptr< ns3::NetDevice >', 'port')], 
   1.199 +                   visibility='protected')
   1.200      ## bridge-net-device.h: ns3::Ptr<ns3::NetDevice> ns3::BridgeNetDevice::GetLearnedState(ns3::Mac48Address source) [member function]
   1.201 -    cls.add_method('GetLearnedState', 'ns3::Ptr< ns3::NetDevice >', [param('ns3::Mac48Address', 'source')], visibility='protected')
   1.202 +    cls.add_method('GetLearnedState', 
   1.203 +                   'ns3::Ptr< ns3::NetDevice >', 
   1.204 +                   [param('ns3::Mac48Address', 'source')], 
   1.205 +                   visibility='protected')
   1.206      return
   1.207  
   1.208  def register_Ns3BridgeChannel_methods(root_module, cls):
   1.209      ## bridge-channel.h: static ns3::TypeId ns3::BridgeChannel::GetTypeId() [member function]
   1.210 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   1.211 +    cls.add_method('GetTypeId', 
   1.212 +                   'ns3::TypeId', 
   1.213 +                   [], 
   1.214 +                   is_static=True)
   1.215      ## bridge-channel.h: ns3::BridgeChannel::BridgeChannel() [constructor]
   1.216 -    cls.add_constructor([], visibility='public')
   1.217 +    cls.add_constructor([])
   1.218      ## bridge-channel.h: void ns3::BridgeChannel::AddChannel(ns3::Ptr<ns3::Channel> bridgedChannel) [member function]
   1.219 -    cls.add_method('AddChannel', 'void', [param('ns3::Ptr< ns3::Channel >', 'bridgedChannel')])
   1.220 +    cls.add_method('AddChannel', 
   1.221 +                   'void', 
   1.222 +                   [param('ns3::Ptr< ns3::Channel >', 'bridgedChannel')])
   1.223      ## bridge-channel.h: uint32_t ns3::BridgeChannel::GetNDevices() const [member function]
   1.224 -    cls.add_method('GetNDevices', 'uint32_t', [], is_const=True, is_virtual=True)
   1.225 +    cls.add_method('GetNDevices', 
   1.226 +                   'uint32_t', 
   1.227 +                   [], 
   1.228 +                   is_const=True, is_virtual=True)
   1.229      ## bridge-channel.h: ns3::Ptr<ns3::NetDevice> ns3::BridgeChannel::GetDevice(uint32_t i) const [member function]
   1.230 -    cls.add_method('GetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_const=True, is_virtual=True)
   1.231 +    cls.add_method('GetDevice', 
   1.232 +                   'ns3::Ptr< ns3::NetDevice >', 
   1.233 +                   [param('uint32_t', 'i')], 
   1.234 +                   is_const=True, is_virtual=True)
   1.235      return
   1.236  
   1.237  def register_functions(root_module):
     2.1 --- a/bindings/python/ns3_module_common.py	Mon Jul 21 11:43:05 2008 +0100
     2.2 +++ b/bindings/python/ns3_module_common.py	Mon Jul 21 15:30:15 2008 +0100
     2.3 @@ -1,4 +1,4 @@
     2.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     2.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     2.6  
     2.7  def register_types(module):
     2.8      root_module = module.get_root()
     2.9 @@ -6,7 +6,7 @@
    2.10      ## error-model.h: ns3::ErrorUnit [enumeration]
    2.11      module.add_enum('ErrorUnit', ['EU_BIT', 'EU_BYTE', 'EU_PKT'])
    2.12      ## packet.h: ns3::Packet [class]
    2.13 -    module.add_class('Packet', incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')
    2.14 +    module.add_class('Packet', memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
    2.15      ## packet.h: ns3::TagIterator [class]
    2.16      module.add_class('TagIterator')
    2.17      ## packet.h: ns3::TagIterator::Item [class]
    2.18 @@ -111,110 +111,211 @@
    2.19  
    2.20  def register_Ns3Packet_methods(root_module, cls):
    2.21      ## packet.h: ns3::Packet::Packet() [constructor]
    2.22 -    cls.add_constructor([], visibility='public')
    2.23 +    cls.add_constructor([])
    2.24      ## packet.h: ns3::Packet::Packet(ns3::Packet const & o) [copy constructor]
    2.25 -    cls.add_constructor([param('ns3::Packet&', 'o', is_const=True)], visibility='public')
    2.26 +    cls.add_constructor([param('ns3::Packet&', 'o', is_const=True)])
    2.27      ## packet.h: ns3::Packet::Packet(uint32_t size) [constructor]
    2.28 -    cls.add_constructor([param('uint32_t', 'size')], visibility='public')
    2.29 +    cls.add_constructor([param('uint32_t', 'size')])
    2.30      ## packet.h: ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
    2.31 -    cls.add_constructor([param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint32_t', 'size')], visibility='public')
    2.32 +    cls.add_constructor([param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint32_t', 'size')])
    2.33      ## packet.h: void ns3::Packet::AddAtEnd(ns3::Ptr<const ns3::Packet> packet) [member function]
    2.34 -    cls.add_method('AddAtEnd', 'void', [param('ns3::Ptr< const ns3::Packet >', 'packet')])
    2.35 +    cls.add_method('AddAtEnd', 
    2.36 +                   'void', 
    2.37 +                   [param('ns3::Ptr< const ns3::Packet >', 'packet')])
    2.38      ## packet.h: void ns3::Packet::AddHeader(ns3::Header const & header) [member function]
    2.39 -    cls.add_method('AddHeader', 'void', [param('ns3::Header&', 'header', is_const=True)])
    2.40 +    cls.add_method('AddHeader', 
    2.41 +                   'void', 
    2.42 +                   [param('ns3::Header&', 'header', is_const=True)])
    2.43      ## packet.h: void ns3::Packet::AddPaddingAtEnd(uint32_t size) [member function]
    2.44 -    cls.add_method('AddPaddingAtEnd', 'void', [param('uint32_t', 'size')])
    2.45 +    cls.add_method('AddPaddingAtEnd', 
    2.46 +                   'void', 
    2.47 +                   [param('uint32_t', 'size')])
    2.48      ## packet.h: void ns3::Packet::AddTag(ns3::Tag const & tag) const [member function]
    2.49 -    cls.add_method('AddTag', 'void', [param('ns3::Tag&', 'tag', is_const=True)], is_const=True)
    2.50 +    cls.add_method('AddTag', 
    2.51 +                   'void', 
    2.52 +                   [param('ns3::Tag&', 'tag', is_const=True)], 
    2.53 +                   is_const=True)
    2.54      ## packet.h: void ns3::Packet::AddTrailer(ns3::Trailer const & trailer) [member function]
    2.55 -    cls.add_method('AddTrailer', 'void', [param('ns3::Trailer&', 'trailer', is_const=True)])
    2.56 +    cls.add_method('AddTrailer', 
    2.57 +                   'void', 
    2.58 +                   [param('ns3::Trailer&', 'trailer', is_const=True)])
    2.59      ## packet.h: ns3::PacketMetadata::ItemIterator ns3::Packet::BeginItem() const [member function]
    2.60 -    cls.add_method('BeginItem', 'ns3::PacketMetadata::ItemIterator', [], is_const=True)
    2.61 +    cls.add_method('BeginItem', 
    2.62 +                   'ns3::PacketMetadata::ItemIterator', 
    2.63 +                   [], 
    2.64 +                   is_const=True)
    2.65      ## packet.h: ns3::Ptr<ns3::Packet> ns3::Packet::Copy() const [member function]
    2.66 -    cls.add_method('Copy', 'ns3::Ptr< ns3::Packet >', [], is_const=True)
    2.67 +    cls.add_method('Copy', 
    2.68 +                   'ns3::Ptr< ns3::Packet >', 
    2.69 +                   [], 
    2.70 +                   is_const=True)
    2.71      ## packet.h: ns3::Ptr<ns3::Packet> ns3::Packet::CreateFragment(uint32_t start, uint32_t length) const [member function]
    2.72 -    cls.add_method('CreateFragment', 'ns3::Ptr< ns3::Packet >', [param('uint32_t', 'start'), param('uint32_t', 'length')], is_const=True)
    2.73 +    cls.add_method('CreateFragment', 
    2.74 +                   'ns3::Ptr< ns3::Packet >', 
    2.75 +                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
    2.76 +                   is_const=True)
    2.77      ## packet.h: void ns3::Packet::Deserialize(ns3::Buffer buffer) [member function]
    2.78 -    cls.add_method('Deserialize', 'void', [param('ns3::Buffer', 'buffer')])
    2.79 +    cls.add_method('Deserialize', 
    2.80 +                   'void', 
    2.81 +                   [param('ns3::Buffer', 'buffer')])
    2.82      ## packet.h: static void ns3::Packet::EnableMetadata() [member function]
    2.83 -    cls.add_method('EnableMetadata', 'void', [], is_static=True)
    2.84 +    cls.add_method('EnableMetadata', 
    2.85 +                   'void', 
    2.86 +                   [], 
    2.87 +                   is_static=True)
    2.88      ## packet.h: bool ns3::Packet::FindFirstMatchingTag(ns3::Tag & tag) const [member function]
    2.89 -    cls.add_method('FindFirstMatchingTag', 'bool', [param('ns3::Tag&', 'tag')], is_const=True)
    2.90 +    cls.add_method('FindFirstMatchingTag', 
    2.91 +                   'bool', 
    2.92 +                   [param('ns3::Tag&', 'tag')], 
    2.93 +                   is_const=True)
    2.94      ## packet.h: uint32_t ns3::Packet::GetSize() const [member function]
    2.95 -    cls.add_method('GetSize', 'uint32_t', [], is_const=True)
    2.96 +    cls.add_method('GetSize', 
    2.97 +                   'uint32_t', 
    2.98 +                   [], 
    2.99 +                   is_const=True)
   2.100      ## packet.h: ns3::TagIterator ns3::Packet::GetTagIterator() const [member function]
   2.101 -    cls.add_method('GetTagIterator', 'ns3::TagIterator', [], is_const=True)
   2.102 +    cls.add_method('GetTagIterator', 
   2.103 +                   'ns3::TagIterator', 
   2.104 +                   [], 
   2.105 +                   is_const=True)
   2.106      ## packet.h: uint32_t ns3::Packet::GetUid() const [member function]
   2.107 -    cls.add_method('GetUid', 'uint32_t', [], is_const=True)
   2.108 +    cls.add_method('GetUid', 
   2.109 +                   'uint32_t', 
   2.110 +                   [], 
   2.111 +                   is_const=True)
   2.112      ## packet.h: uint8_t const * ns3::Packet::PeekData() const [member function]
   2.113 -    cls.add_method('PeekData', retval('uint8_t *', is_const=True, caller_owns_return=False), [], is_const=True)
   2.114 +    cls.add_method('PeekData', 
   2.115 +                   retval('uint8_t *', is_const=True, caller_owns_return=False), 
   2.116 +                   [], 
   2.117 +                   is_const=True)
   2.118      ## packet.h: uint32_t ns3::Packet::PeekHeader(ns3::Header & header) [member function]
   2.119 -    cls.add_method('PeekHeader', 'uint32_t', [param('ns3::Header&', 'header')])
   2.120 +    cls.add_method('PeekHeader', 
   2.121 +                   'uint32_t', 
   2.122 +                   [param('ns3::Header&', 'header')])
   2.123      ## packet.h: uint32_t ns3::Packet::PeekTrailer(ns3::Trailer & trailer) [member function]
   2.124 -    cls.add_method('PeekTrailer', 'uint32_t', [param('ns3::Trailer&', 'trailer')])
   2.125 +    cls.add_method('PeekTrailer', 
   2.126 +                   'uint32_t', 
   2.127 +                   [param('ns3::Trailer&', 'trailer')])
   2.128      ## packet.h: void ns3::Packet::Print(std::ostream & os) const [member function]
   2.129 -    cls.add_method('Print', 'void', [param('std::ostream&', 'os')], is_const=True)
   2.130 +    cls.add_method('Print', 
   2.131 +                   'void', 
   2.132 +                   [param('std::ostream&', 'os')], 
   2.133 +                   is_const=True)
   2.134      ## packet.h: void ns3::Packet::PrintTags(std::ostream & os) const [member function]
   2.135 -    cls.add_method('PrintTags', 'void', [param('std::ostream&', 'os')], is_const=True)
   2.136 +    cls.add_method('PrintTags', 
   2.137 +                   'void', 
   2.138 +                   [param('std::ostream&', 'os')], 
   2.139 +                   is_const=True)
   2.140      ## packet.h: void ns3::Packet::RemoveAllTags() [member function]
   2.141 -    cls.add_method('RemoveAllTags', 'void', [])
   2.142 +    cls.add_method('RemoveAllTags', 
   2.143 +                   'void', 
   2.144 +                   [])
   2.145      ## packet.h: void ns3::Packet::RemoveAtEnd(uint32_t size) [member function]
   2.146 -    cls.add_method('RemoveAtEnd', 'void', [param('uint32_t', 'size')])
   2.147 +    cls.add_method('RemoveAtEnd', 
   2.148 +                   'void', 
   2.149 +                   [param('uint32_t', 'size')])
   2.150      ## packet.h: void ns3::Packet::RemoveAtStart(uint32_t size) [member function]
   2.151 -    cls.add_method('RemoveAtStart', 'void', [param('uint32_t', 'size')])
   2.152 +    cls.add_method('RemoveAtStart', 
   2.153 +                   'void', 
   2.154 +                   [param('uint32_t', 'size')])
   2.155      ## packet.h: uint32_t ns3::Packet::RemoveHeader(ns3::Header & header) [member function]
   2.156 -    cls.add_method('RemoveHeader', 'uint32_t', [param('ns3::Header&', 'header')])
   2.157 +    cls.add_method('RemoveHeader', 
   2.158 +                   'uint32_t', 
   2.159 +                   [param('ns3::Header&', 'header')])
   2.160      ## packet.h: uint32_t ns3::Packet::RemoveTrailer(ns3::Trailer & trailer) [member function]
   2.161 -    cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer&', 'trailer')])
   2.162 +    cls.add_method('RemoveTrailer', 
   2.163 +                   'uint32_t', 
   2.164 +                   [param('ns3::Trailer&', 'trailer')])
   2.165      ## packet.h: ns3::Buffer ns3::Packet::Serialize() const [member function]
   2.166 -    cls.add_method('Serialize', 'ns3::Buffer', [], is_const=True)
   2.167 +    cls.add_method('Serialize', 
   2.168 +                   'ns3::Buffer', 
   2.169 +                   [], 
   2.170 +                   is_const=True)
   2.171      cls.add_output_stream_operator()
   2.172      return
   2.173  
   2.174  def register_Ns3TagIterator_methods(root_module, cls):
   2.175      ## packet.h: bool ns3::TagIterator::HasNext() const [member function]
   2.176 -    cls.add_method('HasNext', 'bool', [], is_const=True)
   2.177 +    cls.add_method('HasNext', 
   2.178 +                   'bool', 
   2.179 +                   [], 
   2.180 +                   is_const=True)
   2.181      ## packet.h: ns3::TagIterator::Item ns3::TagIterator::Next() [member function]
   2.182 -    cls.add_method('Next', 'ns3::TagIterator::Item', [])
   2.183 +    cls.add_method('Next', 
   2.184 +                   'ns3::TagIterator::Item', 
   2.185 +                   [])
   2.186      return
   2.187  
   2.188  def register_Ns3TagIteratorItem_methods(root_module, cls):
   2.189      ## packet.h: ns3::TypeId ns3::TagIterator::Item::GetTypeId() const [member function]
   2.190 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_const=True)
   2.191 +    cls.add_method('GetTypeId', 
   2.192 +                   'ns3::TypeId', 
   2.193 +                   [], 
   2.194 +                   is_const=True)
   2.195      ## packet.h: uint32_t ns3::TagIterator::Item::GetStart() const [member function]
   2.196 -    cls.add_method('GetStart', 'uint32_t', [], is_const=True)
   2.197 +    cls.add_method('GetStart', 
   2.198 +                   'uint32_t', 
   2.199 +                   [], 
   2.200 +                   is_const=True)
   2.201      ## packet.h: uint32_t ns3::TagIterator::Item::GetEnd() const [member function]
   2.202 -    cls.add_method('GetEnd', 'uint32_t', [], is_const=True)
   2.203 +    cls.add_method('GetEnd', 
   2.204 +                   'uint32_t', 
   2.205 +                   [], 
   2.206 +                   is_const=True)
   2.207      ## packet.h: void ns3::TagIterator::Item::GetTag(ns3::Tag & tag) const [member function]
   2.208 -    cls.add_method('GetTag', 'void', [param('ns3::Tag&', 'tag')], is_const=True)
   2.209 +    cls.add_method('GetTag', 
   2.210 +                   'void', 
   2.211 +                   [param('ns3::Tag&', 'tag')], 
   2.212 +                   is_const=True)
   2.213      return
   2.214  
   2.215  def register_Ns3TagList_methods(root_module, cls):
   2.216      ## tag-list.h: ns3::TagList::TagList() [constructor]
   2.217 -    cls.add_constructor([], visibility='public')
   2.218 +    cls.add_constructor([])
   2.219      ## tag-list.h: ns3::TagList::TagList(ns3::TagList const & o) [copy constructor]
   2.220 -    cls.add_constructor([param('ns3::TagList&', 'o', is_const=True)], visibility='public')
   2.221 +    cls.add_constructor([param('ns3::TagList&', 'o', is_const=True)])
   2.222      ## tag-list.h: ns3::TagBuffer ns3::TagList::Add(ns3::TypeId tid, uint32_t bufferSize, int32_t start, int32_t end) [member function]
   2.223 -    cls.add_method('Add', 'ns3::TagBuffer', [param('ns3::TypeId', 'tid'), param('uint32_t', 'bufferSize'), param('int32_t', 'start'), param('int32_t', 'end')])
   2.224 +    cls.add_method('Add', 
   2.225 +                   'ns3::TagBuffer', 
   2.226 +                   [param('ns3::TypeId', 'tid'), param('uint32_t', 'bufferSize'), param('int32_t', 'start'), param('int32_t', 'end')])
   2.227      ## tag-list.h: void ns3::TagList::Add(ns3::TagList const & o) [member function]
   2.228 -    cls.add_method('Add', 'void', [param('ns3::TagList&', 'o', is_const=True)])
   2.229 +    cls.add_method('Add', 
   2.230 +                   'void', 
   2.231 +                   [param('ns3::TagList&', 'o', is_const=True)])
   2.232      ## tag-list.h: void ns3::TagList::RemoveAll() [member function]
   2.233 -    cls.add_method('RemoveAll', 'void', [])
   2.234 +    cls.add_method('RemoveAll', 
   2.235 +                   'void', 
   2.236 +                   [])
   2.237      ## tag-list.h: ns3::TagList::Iterator ns3::TagList::Begin(int32_t offsetStart, int32_t offsetEnd) const [member function]
   2.238 -    cls.add_method('Begin', 'ns3::TagList::Iterator', [param('int32_t', 'offsetStart'), param('int32_t', 'offsetEnd')], is_const=True)
   2.239 +    cls.add_method('Begin', 
   2.240 +                   'ns3::TagList::Iterator', 
   2.241 +                   [param('int32_t', 'offsetStart'), param('int32_t', 'offsetEnd')], 
   2.242 +                   is_const=True)
   2.243      ## tag-list.h: void ns3::TagList::AddAtEnd(int32_t adjustment, int32_t appendOffset) [member function]
   2.244 -    cls.add_method('AddAtEnd', 'void', [param('int32_t', 'adjustment'), param('int32_t', 'appendOffset')])
   2.245 +    cls.add_method('AddAtEnd', 
   2.246 +                   'void', 
   2.247 +                   [param('int32_t', 'adjustment'), param('int32_t', 'appendOffset')])
   2.248      ## tag-list.h: void ns3::TagList::AddAtStart(int32_t adjustment, int32_t prependOffset) [member function]
   2.249 -    cls.add_method('AddAtStart', 'void', [param('int32_t', 'adjustment'), param('int32_t', 'prependOffset')])
   2.250 +    cls.add_method('AddAtStart', 
   2.251 +                   'void', 
   2.252 +                   [param('int32_t', 'adjustment'), param('int32_t', 'prependOffset')])
   2.253      return
   2.254  
   2.255  def register_Ns3TagListIterator_methods(root_module, cls):
   2.256      ## tag-list.h: bool ns3::TagList::Iterator::HasNext() const [member function]
   2.257 -    cls.add_method('HasNext', 'bool', [], is_const=True)
   2.258 +    cls.add_method('HasNext', 
   2.259 +                   'bool', 
   2.260 +                   [], 
   2.261 +                   is_const=True)
   2.262      ## tag-list.h: ns3::TagList::Iterator::Item ns3::TagList::Iterator::Next() [member function]
   2.263 -    cls.add_method('Next', 'ns3::TagList::Iterator::Item', [])
   2.264 +    cls.add_method('Next', 
   2.265 +                   'ns3::TagList::Iterator::Item', 
   2.266 +                   [])
   2.267      ## tag-list.h: uint32_t ns3::TagList::Iterator::GetOffsetStart() const [member function]
   2.268 -    cls.add_method('GetOffsetStart', 'uint32_t', [], is_const=True)
   2.269 +    cls.add_method('GetOffsetStart', 
   2.270 +                   'uint32_t', 
   2.271 +                   [], 
   2.272 +                   is_const=True)
   2.273      return
   2.274  
   2.275  def register_Ns3TagListIteratorItem_methods(root_module, cls):
   2.276 @@ -229,208 +330,384 @@
   2.277      ## tag-list.h: ns3::TagList::Iterator::Item::buf [variable]
   2.278      cls.add_instance_attribute('buf', 'ns3::TagBuffer', is_const=False)
   2.279      ## tag-list.h: ns3::TagList::Iterator::Item::Item(ns3::TagBuffer buf) [constructor]
   2.280 -    cls.add_constructor([param('ns3::TagBuffer', 'buf')], visibility='public')
   2.281 +    cls.add_constructor([param('ns3::TagBuffer', 'buf')])
   2.282      return
   2.283  
   2.284  def register_Ns3TagBuffer_methods(root_module, cls):
   2.285      ## tag-buffer.h: ns3::TagBuffer::TagBuffer(uint8_t * start, uint8_t * end) [constructor]
   2.286 -    cls.add_constructor([param('uint8_t *', 'start'), param('uint8_t *', 'end')], visibility='public')
   2.287 +    cls.add_constructor([param('uint8_t *', 'start'), param('uint8_t *', 'end')])
   2.288      ## tag-buffer.h: void ns3::TagBuffer::TrimAtEnd(uint32_t trim) [member function]
   2.289 -    cls.add_method('TrimAtEnd', 'void', [param('uint32_t', 'trim')])
   2.290 +    cls.add_method('TrimAtEnd', 
   2.291 +                   'void', 
   2.292 +                   [param('uint32_t', 'trim')])
   2.293      ## tag-buffer.h: void ns3::TagBuffer::CopyFrom(ns3::TagBuffer o) [member function]
   2.294 -    cls.add_method('CopyFrom', 'void', [param('ns3::TagBuffer', 'o')])
   2.295 +    cls.add_method('CopyFrom', 
   2.296 +                   'void', 
   2.297 +                   [param('ns3::TagBuffer', 'o')])
   2.298      ## tag-buffer.h: void ns3::TagBuffer::WriteU8(uint8_t v) [member function]
   2.299 -    cls.add_method('WriteU8', 'void', [param('uint8_t', 'v')])
   2.300 +    cls.add_method('WriteU8', 
   2.301 +                   'void', 
   2.302 +                   [param('uint8_t', 'v')])
   2.303      ## tag-buffer.h: void ns3::TagBuffer::WriteU16(uint16_t data) [member function]
   2.304 -    cls.add_method('WriteU16', 'void', [param('uint16_t', 'data')])
   2.305 +    cls.add_method('WriteU16', 
   2.306 +                   'void', 
   2.307 +                   [param('uint16_t', 'data')])
   2.308      ## tag-buffer.h: void ns3::TagBuffer::WriteU32(uint32_t data) [member function]
   2.309 -    cls.add_method('WriteU32', 'void', [param('uint32_t', 'data')])
   2.310 +    cls.add_method('WriteU32', 
   2.311 +                   'void', 
   2.312 +                   [param('uint32_t', 'data')])
   2.313      ## tag-buffer.h: void ns3::TagBuffer::WriteU64(uint64_t v) [member function]
   2.314 -    cls.add_method('WriteU64', 'void', [param('uint64_t', 'v')])
   2.315 +    cls.add_method('WriteU64', 
   2.316 +                   'void', 
   2.317 +                   [param('uint64_t', 'v')])
   2.318      ## tag-buffer.h: void ns3::TagBuffer::WriteDouble(double v) [member function]
   2.319 -    cls.add_method('WriteDouble', 'void', [param('double', 'v')])
   2.320 +    cls.add_method('WriteDouble', 
   2.321 +                   'void', 
   2.322 +                   [param('double', 'v')])
   2.323      ## tag-buffer.h: void ns3::TagBuffer::Write(uint8_t const * buffer, uint32_t size) [member function]
   2.324 -    cls.add_method('Write', 'void', [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint32_t', 'size')])
   2.325 +    cls.add_method('Write', 
   2.326 +                   'void', 
   2.327 +                   [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint32_t', 'size')])
   2.328      ## tag-buffer.h: uint8_t ns3::TagBuffer::ReadU8() [member function]
   2.329 -    cls.add_method('ReadU8', 'uint8_t', [])
   2.330 +    cls.add_method('ReadU8', 
   2.331 +                   'uint8_t', 
   2.332 +                   [])
   2.333      ## tag-buffer.h: uint16_t ns3::TagBuffer::ReadU16() [member function]
   2.334 -    cls.add_method('ReadU16', 'uint16_t', [])
   2.335 +    cls.add_method('ReadU16', 
   2.336 +                   'uint16_t', 
   2.337 +                   [])
   2.338      ## tag-buffer.h: uint32_t ns3::TagBuffer::ReadU32() [member function]
   2.339 -    cls.add_method('ReadU32', 'uint32_t', [])
   2.340 +    cls.add_method('ReadU32', 
   2.341 +                   'uint32_t', 
   2.342 +                   [])
   2.343      ## tag-buffer.h: uint64_t ns3::TagBuffer::ReadU64() [member function]
   2.344 -    cls.add_method('ReadU64', 'uint64_t', [])
   2.345 +    cls.add_method('ReadU64', 
   2.346 +                   'uint64_t', 
   2.347 +                   [])
   2.348      ## tag-buffer.h: double ns3::TagBuffer::ReadDouble() [member function]
   2.349 -    cls.add_method('ReadDouble', 'double', [])
   2.350 +    cls.add_method('ReadDouble', 
   2.351 +                   'double', 
   2.352 +                   [])
   2.353      ## tag-buffer.h: void ns3::TagBuffer::Read(uint8_t * buffer, uint32_t size) [member function]
   2.354 -    cls.add_method('Read', 'void', [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
   2.355 +    cls.add_method('Read', 
   2.356 +                   'void', 
   2.357 +                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
   2.358      return
   2.359  
   2.360  def register_Ns3Buffer_methods(root_module, cls):
   2.361      ## buffer.h: uint32_t ns3::Buffer::GetSize() const [member function]
   2.362 -    cls.add_method('GetSize', 'uint32_t', [], is_const=True)
   2.363 +    cls.add_method('GetSize', 
   2.364 +                   'uint32_t', 
   2.365 +                   [], 
   2.366 +                   is_const=True)
   2.367      ## buffer.h: uint8_t const * ns3::Buffer::PeekData() const [member function]
   2.368 -    cls.add_method('PeekData', retval('uint8_t *', is_const=True, caller_owns_return=False), [], is_const=True)
   2.369 +    cls.add_method('PeekData', 
   2.370 +                   retval('uint8_t *', is_const=True, caller_owns_return=False), 
   2.371 +                   [], 
   2.372 +                   is_const=True)
   2.373      ## buffer.h: bool ns3::Buffer::AddAtStart(uint32_t start) [member function]
   2.374 -    cls.add_method('AddAtStart', 'bool', [param('uint32_t', 'start')])
   2.375 +    cls.add_method('AddAtStart', 
   2.376 +                   'bool', 
   2.377 +                   [param('uint32_t', 'start')])
   2.378      ## buffer.h: bool ns3::Buffer::AddAtEnd(uint32_t end) [member function]
   2.379 -    cls.add_method('AddAtEnd', 'bool', [param('uint32_t', 'end')])
   2.380 +    cls.add_method('AddAtEnd', 
   2.381 +                   'bool', 
   2.382 +                   [param('uint32_t', 'end')])
   2.383      ## buffer.h: void ns3::Buffer::AddAtEnd(ns3::Buffer const & o) [member function]
   2.384 -    cls.add_method('AddAtEnd', 'void', [param('ns3::Buffer&', 'o', is_const=True)])
   2.385 +    cls.add_method('AddAtEnd', 
   2.386 +                   'void', 
   2.387 +                   [param('ns3::Buffer&', 'o', is_const=True)])
   2.388      ## buffer.h: void ns3::Buffer::RemoveAtStart(uint32_t start) [member function]
   2.389 -    cls.add_method('RemoveAtStart', 'void', [param('uint32_t', 'start')])
   2.390 +    cls.add_method('RemoveAtStart', 
   2.391 +                   'void', 
   2.392 +                   [param('uint32_t', 'start')])
   2.393      ## buffer.h: void ns3::Buffer::RemoveAtEnd(uint32_t end) [member function]
   2.394 -    cls.add_method('RemoveAtEnd', 'void', [param('uint32_t', 'end')])
   2.395 +    cls.add_method('RemoveAtEnd', 
   2.396 +                   'void', 
   2.397 +                   [param('uint32_t', 'end')])
   2.398      ## buffer.h: ns3::Buffer ns3::Buffer::CreateFragment(uint32_t start, uint32_t length) const [member function]
   2.399 -    cls.add_method('CreateFragment', 'ns3::Buffer', [param('uint32_t', 'start'), param('uint32_t', 'length')], is_const=True)
   2.400 +    cls.add_method('CreateFragment', 
   2.401 +                   'ns3::Buffer', 
   2.402 +                   [param('uint32_t', 'start'), param('uint32_t', 'length')], 
   2.403 +                   is_const=True)
   2.404      ## buffer.h: ns3::Buffer::Iterator ns3::Buffer::Begin() const [member function]
   2.405 -    cls.add_method('Begin', 'ns3::Buffer::Iterator', [], is_const=True)
   2.406 +    cls.add_method('Begin', 
   2.407 +                   'ns3::Buffer::Iterator', 
   2.408 +                   [], 
   2.409 +                   is_const=True)
   2.410      ## buffer.h: ns3::Buffer::Iterator ns3::Buffer::End() const [member function]
   2.411 -    cls.add_method('End', 'ns3::Buffer::Iterator', [], is_const=True)
   2.412 +    cls.add_method('End', 
   2.413 +                   'ns3::Buffer::Iterator', 
   2.414 +                   [], 
   2.415 +                   is_const=True)
   2.416      ## buffer.h: ns3::Buffer ns3::Buffer::CreateFullCopy() const [member function]
   2.417 -    cls.add_method('CreateFullCopy', 'ns3::Buffer', [], is_const=True)
   2.418 +    cls.add_method('CreateFullCopy', 
   2.419 +                   'ns3::Buffer', 
   2.420 +                   [], 
   2.421 +                   is_const=True)
   2.422      ## buffer.h: int32_t ns3::Buffer::GetCurrentStartOffset() const [member function]
   2.423 -    cls.add_method('GetCurrentStartOffset', 'int32_t', [], is_const=True)
   2.424 +    cls.add_method('GetCurrentStartOffset', 
   2.425 +                   'int32_t', 
   2.426 +                   [], 
   2.427 +                   is_const=True)
   2.428      ## buffer.h: int32_t ns3::Buffer::GetCurrentEndOffset() const [member function]
   2.429 -    cls.add_method('GetCurrentEndOffset', 'int32_t', [], is_const=True)
   2.430 +    cls.add_method('GetCurrentEndOffset', 
   2.431 +                   'int32_t', 
   2.432 +                   [], 
   2.433 +                   is_const=True)
   2.434      ## buffer.h: ns3::Buffer::Buffer(ns3::Buffer const & o) [copy constructor]
   2.435 -    cls.add_constructor([param('ns3::Buffer&', 'o', is_const=True)], visibility='public')
   2.436 +    cls.add_constructor([param('ns3::Buffer&', 'o', is_const=True)])
   2.437      ## buffer.h: ns3::Buffer::Buffer() [constructor]
   2.438 -    cls.add_constructor([], visibility='public')
   2.439 +    cls.add_constructor([])
   2.440      ## buffer.h: ns3::Buffer::Buffer(uint32_t dataSize) [constructor]
   2.441 -    cls.add_constructor([param('uint32_t', 'dataSize')], visibility='public')
   2.442 +    cls.add_constructor([param('uint32_t', 'dataSize')])
   2.443      return
   2.444  
   2.445  def register_Ns3BufferIterator_methods(root_module, cls):
   2.446      ## buffer.h: ns3::Buffer::Iterator::Iterator() [constructor]
   2.447 -    cls.add_constructor([], visibility='public')
   2.448 +    cls.add_constructor([])
   2.449      ## buffer.h: void ns3::Buffer::Iterator::Next() [member function]
   2.450 -    cls.add_method('Next', 'void', [])
   2.451 +    cls.add_method('Next', 
   2.452 +                   'void', 
   2.453 +                   [])
   2.454      ## buffer.h: void ns3::Buffer::Iterator::Prev() [member function]
   2.455 -    cls.add_method('Prev', 'void', [])
   2.456 +    cls.add_method('Prev', 
   2.457 +                   'void', 
   2.458 +                   [])
   2.459      ## buffer.h: void ns3::Buffer::Iterator::Next(uint32_t delta) [member function]
   2.460 -    cls.add_method('Next', 'void', [param('uint32_t', 'delta')])
   2.461 +    cls.add_method('Next', 
   2.462 +                   'void', 
   2.463 +                   [param('uint32_t', 'delta')])
   2.464      ## buffer.h: void ns3::Buffer::Iterator::Prev(uint32_t delta) [member function]
   2.465 -    cls.add_method('Prev', 'void', [param('uint32_t', 'delta')])
   2.466 +    cls.add_method('Prev', 
   2.467 +                   'void', 
   2.468 +                   [param('uint32_t', 'delta')])
   2.469      ## buffer.h: uint32_t ns3::Buffer::Iterator::GetDistanceFrom(ns3::Buffer::Iterator const & o) const [member function]
   2.470 -    cls.add_method('GetDistanceFrom', 'uint32_t', [param('ns3::Buffer::Iterator&', 'o', is_const=True)], is_const=True)
   2.471 +    cls.add_method('GetDistanceFrom', 
   2.472 +                   'uint32_t', 
   2.473 +                   [param('ns3::Buffer::Iterator&', 'o', is_const=True)], 
   2.474 +                   is_const=True)
   2.475      ## buffer.h: bool ns3::Buffer::Iterator::IsEnd() const [member function]
   2.476 -    cls.add_method('IsEnd', 'bool', [], is_const=True)
   2.477 +    cls.add_method('IsEnd', 
   2.478 +                   'bool', 
   2.479 +                   [], 
   2.480 +                   is_const=True)
   2.481      ## buffer.h: bool ns3::Buffer::Iterator::IsStart() const [member function]
   2.482 -    cls.add_method('IsStart', 'bool', [], is_const=True)
   2.483 +    cls.add_method('IsStart', 
   2.484 +                   'bool', 
   2.485 +                   [], 
   2.486 +                   is_const=True)
   2.487      ## buffer.h: void ns3::Buffer::Iterator::WriteU8(uint8_t data) [member function]
   2.488 -    cls.add_method('WriteU8', 'void', [param('uint8_t', 'data')])
   2.489 +    cls.add_method('WriteU8', 
   2.490 +                   'void', 
   2.491 +                   [param('uint8_t', 'data')])
   2.492      ## buffer.h: void ns3::Buffer::Iterator::WriteU8(uint8_t data, uint32_t len) [member function]
   2.493 -    cls.add_method('WriteU8', 'void', [param('uint8_t', 'data'), param('uint32_t', 'len')])
   2.494 +    cls.add_method('WriteU8', 
   2.495 +                   'void', 
   2.496 +                   [param('uint8_t', 'data'), param('uint32_t', 'len')])
   2.497      ## buffer.h: void ns3::Buffer::Iterator::WriteU16(uint16_t data) [member function]
   2.498 -    cls.add_method('WriteU16', 'void', [param('uint16_t', 'data')])
   2.499 +    cls.add_method('WriteU16', 
   2.500 +                   'void', 
   2.501 +                   [param('uint16_t', 'data')])
   2.502      ## buffer.h: void ns3::Buffer::Iterator::WriteU32(uint32_t data) [member function]
   2.503 -    cls.add_method('WriteU32', 'void', [param('uint32_t', 'data')])
   2.504 +    cls.add_method('WriteU32', 
   2.505 +                   'void', 
   2.506 +                   [param('uint32_t', 'data')])
   2.507      ## buffer.h: void ns3::Buffer::Iterator::WriteU64(uint64_t data) [member function]
   2.508 -    cls.add_method('WriteU64', 'void', [param('uint64_t', 'data')])
   2.509 +    cls.add_method('WriteU64', 
   2.510 +                   'void', 
   2.511 +                   [param('uint64_t', 'data')])
   2.512      ## buffer.h: void ns3::Buffer::Iterator::WriteHtolsbU16(uint16_t data) [member function]
   2.513 -    cls.add_method('WriteHtolsbU16', 'void', [param('uint16_t', 'data')])
   2.514 +    cls.add_method('WriteHtolsbU16', 
   2.515 +                   'void', 
   2.516 +                   [param('uint16_t', 'data')])
   2.517      ## buffer.h: void ns3::Buffer::Iterator::WriteHtolsbU32(uint32_t data) [member function]
   2.518 -    cls.add_method('WriteHtolsbU32', 'void', [param('uint32_t', 'data')])
   2.519 +    cls.add_method('WriteHtolsbU32', 
   2.520 +                   'void', 
   2.521 +                   [param('uint32_t', 'data')])
   2.522      ## buffer.h: void ns3::Buffer::Iterator::WriteHtolsbU64(uint64_t data) [member function]
   2.523 -    cls.add_method('WriteHtolsbU64', 'void', [param('uint64_t', 'data')])
   2.524 +    cls.add_method('WriteHtolsbU64', 
   2.525 +                   'void', 
   2.526 +                   [param('uint64_t', 'data')])
   2.527      ## buffer.h: void ns3::Buffer::Iterator::WriteHtonU16(uint16_t data) [member function]
   2.528 -    cls.add_method('WriteHtonU16', 'void', [param('uint16_t', 'data')])
   2.529 +    cls.add_method('WriteHtonU16', 
   2.530 +                   'void', 
   2.531 +                   [param('uint16_t', 'data')])
   2.532      ## buffer.h: void ns3::Buffer::Iterator::WriteHtonU32(uint32_t data) [member function]
   2.533 -    cls.add_method('WriteHtonU32', 'void', [param('uint32_t', 'data')])
   2.534 +    cls.add_method('WriteHtonU32', 
   2.535 +                   'void', 
   2.536 +                   [param('uint32_t', 'data')])
   2.537      ## buffer.h: void ns3::Buffer::Iterator::WriteHtonU64(uint64_t data) [member function]
   2.538 -    cls.add_method('WriteHtonU64', 'void', [param('uint64_t', 'data')])
   2.539 +    cls.add_method('WriteHtonU64', 
   2.540 +                   'void', 
   2.541 +                   [param('uint64_t', 'data')])
   2.542      ## buffer.h: void ns3::Buffer::Iterator::Write(uint8_t const * buffer, uint32_t size) [member function]
   2.543 -    cls.add_method('Write', 'void', [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint32_t', 'size')])
   2.544 +    cls.add_method('Write', 
   2.545 +                   'void', 
   2.546 +                   [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint32_t', 'size')])
   2.547      ## buffer.h: void ns3::Buffer::Iterator::Write(ns3::Buffer::Iterator start, ns3::Buffer::Iterator end) [member function]
   2.548 -    cls.add_method('Write', 'void', [param('ns3::Buffer::Iterator', 'start'), param('ns3::Buffer::Iterator', 'end')])
   2.549 +    cls.add_method('Write', 
   2.550 +                   'void', 
   2.551 +                   [param('ns3::Buffer::Iterator', 'start'), param('ns3::Buffer::Iterator', 'end')])
   2.552      ## buffer.h: uint8_t ns3::Buffer::Iterator::ReadU8() [member function]
   2.553 -    cls.add_method('ReadU8', 'uint8_t', [])
   2.554 +    cls.add_method('ReadU8', 
   2.555 +                   'uint8_t', 
   2.556 +                   [])
   2.557      ## buffer.h: uint16_t ns3::Buffer::Iterator::ReadU16() [member function]
   2.558 -    cls.add_method('ReadU16', 'uint16_t', [])
   2.559 +    cls.add_method('ReadU16', 
   2.560 +                   'uint16_t', 
   2.561 +                   [])
   2.562      ## buffer.h: uint32_t ns3::Buffer::Iterator::ReadU32() [member function]
   2.563 -    cls.add_method('ReadU32', 'uint32_t', [])
   2.564 +    cls.add_method('ReadU32', 
   2.565 +                   'uint32_t', 
   2.566 +                   [])
   2.567      ## buffer.h: uint64_t ns3::Buffer::Iterator::ReadU64() [member function]
   2.568 -    cls.add_method('ReadU64', 'uint64_t', [])
   2.569 +    cls.add_method('ReadU64', 
   2.570 +                   'uint64_t', 
   2.571 +                   [])
   2.572      ## buffer.h: uint16_t ns3::Buffer::Iterator::ReadNtohU16() [member function]
   2.573 -    cls.add_method('ReadNtohU16', 'uint16_t', [])
   2.574 +    cls.add_method('ReadNtohU16', 
   2.575 +                   'uint16_t', 
   2.576 +                   [])
   2.577      ## buffer.h: uint32_t ns3::Buffer::Iterator::ReadNtohU32() [member function]
   2.578 -    cls.add_method('ReadNtohU32', 'uint32_t', [])
   2.579 +    cls.add_method('ReadNtohU32', 
   2.580 +                   'uint32_t', 
   2.581 +                   [])
   2.582      ## buffer.h: uint64_t ns3::Buffer::Iterator::ReadNtohU64() [member function]
   2.583 -    cls.add_method('ReadNtohU64', 'uint64_t', [])
   2.584 +    cls.add_method('ReadNtohU64', 
   2.585 +                   'uint64_t', 
   2.586 +                   [])
   2.587      ## buffer.h: uint16_t ns3::Buffer::Iterator::ReadLsbtohU16() [member function]
   2.588 -    cls.add_method('ReadLsbtohU16', 'uint16_t', [])
   2.589 +    cls.add_method('ReadLsbtohU16', 
   2.590 +                   'uint16_t', 
   2.591 +                   [])
   2.592      ## buffer.h: uint32_t ns3::Buffer::Iterator::ReadLsbtohU32() [member function]
   2.593 -    cls.add_method('ReadLsbtohU32', 'uint32_t', [])
   2.594 +    cls.add_method('ReadLsbtohU32', 
   2.595 +                   'uint32_t', 
   2.596 +                   [])
   2.597      ## buffer.h: uint64_t ns3::Buffer::Iterator::ReadLsbtohU64() [member function]
   2.598 -    cls.add_method('ReadLsbtohU64', 'uint64_t', [])
   2.599 +    cls.add_method('ReadLsbtohU64', 
   2.600 +                   'uint64_t', 
   2.601 +                   [])
   2.602      ## buffer.h: void ns3::Buffer::Iterator::Read(uint8_t * buffer, uint32_t size) [member function]
   2.603 -    cls.add_method('Read', 'void', [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
   2.604 +    cls.add_method('Read', 
   2.605 +                   'void', 
   2.606 +                   [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
   2.607      ## buffer.h: uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size) [member function]
   2.608 -    cls.add_method('CalculateIpChecksum', 'uint16_t', [param('uint16_t', 'size')])
   2.609 +    cls.add_method('CalculateIpChecksum', 
   2.610 +                   'uint16_t', 
   2.611 +                   [param('uint16_t', 'size')])
   2.612      ## buffer.h: uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size, uint32_t initialChecksum) [member function]
   2.613 -    cls.add_method('CalculateIpChecksum', 'uint16_t', [param('uint16_t', 'size'), param('uint32_t', 'initialChecksum')])
   2.614 +    cls.add_method('CalculateIpChecksum', 
   2.615 +                   'uint16_t', 
   2.616 +                   [param('uint16_t', 'size'), param('uint32_t', 'initialChecksum')])
   2.617      ## buffer.h: uint32_t ns3::Buffer::Iterator::GetSize() const [member function]
   2.618 -    cls.add_method('GetSize', 'uint32_t', [], is_const=True)
   2.619 +    cls.add_method('GetSize', 
   2.620 +                   'uint32_t', 
   2.621 +                   [], 
   2.622 +                   is_const=True)
   2.623      return
   2.624  
   2.625  def register_Ns3Chunk_methods(root_module, cls):
   2.626      ## chunk.h: ns3::Chunk::Chunk() [constructor]
   2.627 -    cls.add_constructor([], visibility='public')
   2.628 +    cls.add_constructor([])
   2.629      ## chunk.h: ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor]
   2.630 -    cls.add_constructor([param('ns3::Chunk&', 'arg0', is_const=True)], visibility='public')
   2.631 +    cls.add_constructor([param('ns3::Chunk&', 'arg0', is_const=True)])
   2.632      ## chunk.h: static ns3::TypeId ns3::Chunk::GetTypeId() [member function]
   2.633 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   2.634 +    cls.add_method('GetTypeId', 
   2.635 +                   'ns3::TypeId', 
   2.636 +                   [], 
   2.637 +                   is_static=True)
   2.638      ## chunk.h: uint32_t ns3::Chunk::Deserialize(ns3::Buffer::Iterator start) [member function]
   2.639 -    cls.add_method('Deserialize', 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_pure_virtual=True, is_virtual=True)
   2.640 +    cls.add_method('Deserialize', 
   2.641 +                   'uint32_t', 
   2.642 +                   [param('ns3::Buffer::Iterator', 'start')], 
   2.643 +                   is_pure_virtual=True, is_virtual=True)
   2.644      ## chunk.h: void ns3::Chunk::Print(std::ostream & os) const [member function]
   2.645 -    cls.add_method('Print', 'void', [param('std::ostream&', 'os')], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.646 +    cls.add_method('Print', 
   2.647 +                   'void', 
   2.648 +                   [param('std::ostream&', 'os')], 
   2.649 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.650      return
   2.651  
   2.652  def register_Ns3DataRate_methods(root_module, cls):
   2.653      ## data-rate.h: ns3::DataRate::DataRate(ns3::DataRate const & arg0) [copy constructor]
   2.654 -    cls.add_constructor([param('ns3::DataRate&', 'arg0', is_const=True)], visibility='public')
   2.655 +    cls.add_constructor([param('ns3::DataRate&', 'arg0', is_const=True)])
   2.656      ## data-rate.h: ns3::DataRate::DataRate() [constructor]
   2.657 -    cls.add_constructor([], visibility='public')
   2.658 +    cls.add_constructor([])
   2.659      ## data-rate.h: ns3::DataRate::DataRate(uint64_t bps) [constructor]
   2.660 -    cls.add_constructor([param('uint64_t', 'bps')], visibility='public')
   2.661 +    cls.add_constructor([param('uint64_t', 'bps')])
   2.662      ## data-rate.h: ns3::DataRate::DataRate(std::string rate) [constructor]
   2.663 -    cls.add_constructor([param('std::string', 'rate')], visibility='public')
   2.664 +    cls.add_constructor([param('std::string', 'rate')])
   2.665      ## data-rate.h: double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
   2.666 -    cls.add_method('CalculateTxTime', 'double', [param('uint32_t', 'bytes')], is_const=True)
   2.667 +    cls.add_method('CalculateTxTime', 
   2.668 +                   'double', 
   2.669 +                   [param('uint32_t', 'bytes')], 
   2.670 +                   is_const=True)
   2.671      ## data-rate.h: uint64_t ns3::DataRate::GetBitRate() const [member function]
   2.672 -    cls.add_method('GetBitRate', 'uint64_t', [], is_const=True)
   2.673 +    cls.add_method('GetBitRate', 
   2.674 +                   'uint64_t', 
   2.675 +                   [], 
   2.676 +                   is_const=True)
   2.677      cls.add_output_stream_operator()
   2.678      return
   2.679  
   2.680  def register_Ns3Tag_methods(root_module, cls):
   2.681      ## tag.h: static ns3::TypeId ns3::Tag::GetTypeId() [member function]
   2.682 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   2.683 +    cls.add_method('GetTypeId', 
   2.684 +                   'ns3::TypeId', 
   2.685 +                   [], 
   2.686 +                   is_static=True)
   2.687      ## tag.h: uint32_t ns3::Tag::GetSerializedSize() const [member function]
   2.688 -    cls.add_method('GetSerializedSize', 'uint32_t', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.689 +    cls.add_method('GetSerializedSize', 
   2.690 +                   'uint32_t', 
   2.691 +                   [], 
   2.692 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.693      ## tag.h: void ns3::Tag::Serialize(ns3::TagBuffer i) const [member function]
   2.694 -    cls.add_method('Serialize', 'void', [param('ns3::TagBuffer', 'i')], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.695 +    cls.add_method('Serialize', 
   2.696 +                   'void', 
   2.697 +                   [param('ns3::TagBuffer', 'i')], 
   2.698 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.699      ## tag.h: void ns3::Tag::Deserialize(ns3::TagBuffer i) [member function]
   2.700 -    cls.add_method('Deserialize', 'void', [param('ns3::TagBuffer', 'i')], is_pure_virtual=True, is_virtual=True)
   2.701 +    cls.add_method('Deserialize', 
   2.702 +                   'void', 
   2.703 +                   [param('ns3::TagBuffer', 'i')], 
   2.704 +                   is_pure_virtual=True, is_virtual=True)
   2.705      ## tag.h: void ns3::Tag::Print(std::ostream & os) const [member function]
   2.706 -    cls.add_method('Print', 'void', [param('std::ostream&', 'os')], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.707 +    cls.add_method('Print', 
   2.708 +                   'void', 
   2.709 +                   [param('std::ostream&', 'os')], 
   2.710 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.711      cls.add_constructor([])
   2.712      return
   2.713  
   2.714  def register_Ns3PcapWriter_methods(root_module, cls):
   2.715      ## pcap-writer.h: ns3::PcapWriter::PcapWriter() [constructor]
   2.716 -    cls.add_constructor([], visibility='public')
   2.717 +    cls.add_constructor([])
   2.718      ## pcap-writer.h: void ns3::PcapWriter::Open(std::string const & name) [member function]
   2.719 -    cls.add_method('Open', 'void', [param('std::string&', 'name', is_const=True)])
   2.720 +    cls.add_method('Open', 
   2.721 +                   'void', 
   2.722 +                   [param('std::string&', 'name', is_const=True)])
   2.723      ## pcap-writer.h: void ns3::PcapWriter::WriteEthernetHeader() [member function]
   2.724 -    cls.add_method('WriteEthernetHeader', 'void', [])
   2.725 +    cls.add_method('WriteEthernetHeader', 
   2.726 +                   'void', 
   2.727 +                   [])
   2.728      ## pcap-writer.h: void ns3::PcapWriter::WriteIpHeader() [member function]
   2.729 -    cls.add_method('WriteIpHeader', 'void', [])
   2.730 +    cls.add_method('WriteIpHeader', 
   2.731 +                   'void', 
   2.732 +                   [])
   2.733      ## pcap-writer.h: void ns3::PcapWriter::WriteWifiHeader() [member function]
   2.734 -    cls.add_method('WriteWifiHeader', 'void', [])
   2.735 +    cls.add_method('WriteWifiHeader', 
   2.736 +                   'void', 
   2.737 +                   [])
   2.738      ## pcap-writer.h: void ns3::PcapWriter::WritePppHeader() [member function]
   2.739 -    cls.add_method('WritePppHeader', 'void', [])
   2.740 +    cls.add_method('WritePppHeader', 
   2.741 +                   'void', 
   2.742 +                   [])
   2.743      ## pcap-writer.h: void ns3::PcapWriter::WritePacket(ns3::Ptr<const ns3::Packet> packet) [member function]
   2.744 -    cls.add_method('WritePacket', 'void', [param('ns3::Ptr< const ns3::Packet >', 'packet')])
   2.745 +    cls.add_method('WritePacket', 
   2.746 +                   'void', 
   2.747 +                   [param('ns3::Ptr< const ns3::Packet >', 'packet')])
   2.748      return
   2.749  
   2.750  def register_Ns3DataRateChecker_methods(root_module, cls):
   2.751 @@ -439,124 +716,234 @@
   2.752  
   2.753  def register_Ns3ErrorModel_methods(root_module, cls):
   2.754      ## error-model.h: static ns3::TypeId ns3::ErrorModel::GetTypeId() [member function]
   2.755 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   2.756 +    cls.add_method('GetTypeId', 
   2.757 +                   'ns3::TypeId', 
   2.758 +                   [], 
   2.759 +                   is_static=True)
   2.760      ## error-model.h: ns3::ErrorModel::ErrorModel() [constructor]
   2.761 -    cls.add_constructor([], visibility='public')
   2.762 +    cls.add_constructor([])
   2.763      ## error-model.h: bool ns3::ErrorModel::IsCorrupt(ns3::Ptr<ns3::Packet> pkt) [member function]
   2.764 -    cls.add_method('IsCorrupt', 'bool', [param('ns3::Ptr< ns3::Packet >', 'pkt')])
   2.765 +    cls.add_method('IsCorrupt', 
   2.766 +                   'bool', 
   2.767 +                   [param('ns3::Ptr< ns3::Packet >', 'pkt')])
   2.768      ## error-model.h: void ns3::ErrorModel::Reset() [member function]
   2.769 -    cls.add_method('Reset', 'void', [])
   2.770 +    cls.add_method('Reset', 
   2.771 +                   'void', 
   2.772 +                   [])
   2.773      ## error-model.h: void ns3::ErrorModel::Enable() [member function]
   2.774 -    cls.add_method('Enable', 'void', [])
   2.775 +    cls.add_method('Enable', 
   2.776 +                   'void', 
   2.777 +                   [])
   2.778      ## error-model.h: void ns3::ErrorModel::Disable() [member function]
   2.779 -    cls.add_method('Disable', 'void', [])
   2.780 +    cls.add_method('Disable', 
   2.781 +                   'void', 
   2.782 +                   [])
   2.783      ## error-model.h: bool ns3::ErrorModel::IsEnabled() const [member function]
   2.784 -    cls.add_method('IsEnabled', 'bool', [], is_const=True)
   2.785 +    cls.add_method('IsEnabled', 
   2.786 +                   'bool', 
   2.787 +                   [], 
   2.788 +                   is_const=True)
   2.789      ## error-model.h: bool ns3::ErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> arg0) [member function]
   2.790 -    cls.add_method('DoCorrupt', 'bool', [param('ns3::Ptr< ns3::Packet >', 'arg0')], is_pure_virtual=True, visibility='private', is_virtual=True)
   2.791 +    cls.add_method('DoCorrupt', 
   2.792 +                   'bool', 
   2.793 +                   [param('ns3::Ptr< ns3::Packet >', 'arg0')], 
   2.794 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
   2.795      ## error-model.h: void ns3::ErrorModel::DoReset() [member function]
   2.796 -    cls.add_method('DoReset', 'void', [], is_pure_virtual=True, visibility='private', is_virtual=True)
   2.797 +    cls.add_method('DoReset', 
   2.798 +                   'void', 
   2.799 +                   [], 
   2.800 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
   2.801      return
   2.802  
   2.803  def register_Ns3Header_methods(root_module, cls):
   2.804      ## header.h: ns3::Header::Header() [constructor]
   2.805 -    cls.add_constructor([], visibility='public')
   2.806 +    cls.add_constructor([])
   2.807      ## header.h: ns3::Header::Header(ns3::Header const & arg0) [copy constructor]
   2.808 -    cls.add_constructor([param('ns3::Header&', 'arg0', is_const=True)], visibility='public')
   2.809 +    cls.add_constructor([param('ns3::Header&', 'arg0', is_const=True)])
   2.810      ## header.h: uint32_t ns3::Header::Deserialize(ns3::Buffer::Iterator start) [member function]
   2.811 -    cls.add_method('Deserialize', 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_pure_virtual=True, is_virtual=True)
   2.812 +    cls.add_method('Deserialize', 
   2.813 +                   'uint32_t', 
   2.814 +                   [param('ns3::Buffer::Iterator', 'start')], 
   2.815 +                   is_pure_virtual=True, is_virtual=True)
   2.816      ## header.h: uint32_t ns3::Header::GetSerializedSize() const [member function]
   2.817 -    cls.add_method('GetSerializedSize', 'uint32_t', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.818 +    cls.add_method('GetSerializedSize', 
   2.819 +                   'uint32_t', 
   2.820 +                   [], 
   2.821 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.822      ## header.h: static ns3::TypeId ns3::Header::GetTypeId() [member function]
   2.823 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   2.824 +    cls.add_method('GetTypeId', 
   2.825 +                   'ns3::TypeId', 
   2.826 +                   [], 
   2.827 +                   is_static=True)
   2.828      ## header.h: void ns3::Header::Print(std::ostream & os) const [member function]
   2.829 -    cls.add_method('Print', 'void', [param('std::ostream&', 'os')], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.830 +    cls.add_method('Print', 
   2.831 +                   'void', 
   2.832 +                   [param('std::ostream&', 'os')], 
   2.833 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.834      ## header.h: void ns3::Header::Serialize(ns3::Buffer::Iterator start) const [member function]
   2.835 -    cls.add_method('Serialize', 'void', [param('ns3::Buffer::Iterator', 'start')], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.836 +    cls.add_method('Serialize', 
   2.837 +                   'void', 
   2.838 +                   [param('ns3::Buffer::Iterator', 'start')], 
   2.839 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.840      cls.add_output_stream_operator()
   2.841      return
   2.842  
   2.843  def register_Ns3Trailer_methods(root_module, cls):
   2.844      ## trailer.h: ns3::Trailer::Trailer() [constructor]
   2.845 -    cls.add_constructor([], visibility='public')
   2.846 +    cls.add_constructor([])
   2.847      ## trailer.h: ns3::Trailer::Trailer(ns3::Trailer const & arg0) [copy constructor]
   2.848 -    cls.add_constructor([param('ns3::Trailer&', 'arg0', is_const=True)], visibility='public')
   2.849 +    cls.add_constructor([param('ns3::Trailer&', 'arg0', is_const=True)])
   2.850      ## trailer.h: uint32_t ns3::Trailer::Deserialize(ns3::Buffer::Iterator end) [member function]
   2.851 -    cls.add_method('Deserialize', 'uint32_t', [param('ns3::Buffer::Iterator', 'end')], is_pure_virtual=True, is_virtual=True)
   2.852 +    cls.add_method('Deserialize', 
   2.853 +                   'uint32_t', 
   2.854 +                   [param('ns3::Buffer::Iterator', 'end')], 
   2.855 +                   is_pure_virtual=True, is_virtual=True)
   2.856      ## trailer.h: uint32_t ns3::Trailer::GetSerializedSize() const [member function]
   2.857 -    cls.add_method('GetSerializedSize', 'uint32_t', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.858 +    cls.add_method('GetSerializedSize', 
   2.859 +                   'uint32_t', 
   2.860 +                   [], 
   2.861 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.862      ## trailer.h: static ns3::TypeId ns3::Trailer::GetTypeId() [member function]
   2.863 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   2.864 +    cls.add_method('GetTypeId', 
   2.865 +                   'ns3::TypeId', 
   2.866 +                   [], 
   2.867 +                   is_static=True)
   2.868      ## trailer.h: void ns3::Trailer::Print(std::ostream & os) const [member function]
   2.869 -    cls.add_method('Print', 'void', [param('std::ostream&', 'os')], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.870 +    cls.add_method('Print', 
   2.871 +                   'void', 
   2.872 +                   [param('std::ostream&', 'os')], 
   2.873 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.874      ## trailer.h: void ns3::Trailer::Serialize(ns3::Buffer::Iterator start) const [member function]
   2.875 -    cls.add_method('Serialize', 'void', [param('ns3::Buffer::Iterator', 'start')], is_pure_virtual=True, is_const=True, is_virtual=True)
   2.876 +    cls.add_method('Serialize', 
   2.877 +                   'void', 
   2.878 +                   [param('ns3::Buffer::Iterator', 'start')], 
   2.879 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   2.880      cls.add_output_stream_operator()
   2.881      return
   2.882  
   2.883  def register_Ns3ListErrorModel_methods(root_module, cls):
   2.884      ## error-model.h: static ns3::TypeId ns3::ListErrorModel::GetTypeId() [member function]
   2.885 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   2.886 +    cls.add_method('GetTypeId', 
   2.887 +                   'ns3::TypeId', 
   2.888 +                   [], 
   2.889 +                   is_static=True)
   2.890      ## error-model.h: ns3::ListErrorModel::ListErrorModel() [constructor]
   2.891 -    cls.add_constructor([], visibility='public')
   2.892 +    cls.add_constructor([])
   2.893      ## error-model.h: std::list<unsigned int, std::allocator<unsigned int> > ns3::ListErrorModel::GetList() const [member function]
   2.894 -    cls.add_method('GetList', 'std::list< unsigned int, std::allocator< unsigned int > >', [], is_const=True)
   2.895 +    cls.add_method('GetList', 
   2.896 +                   'std::list< unsigned int, std::allocator< unsigned int > >', 
   2.897 +                   [], 
   2.898 +                   is_const=True)
   2.899      ## error-model.h: void ns3::ListErrorModel::SetList(std::list<unsigned int, std::allocator<unsigned int> > const & packetlist) [member function]
   2.900 -    cls.add_method('SetList', 'void', [param('std::list< unsigned int, std::allocator< unsigned int > >&', 'packetlist', is_const=True)])
   2.901 +    cls.add_method('SetList', 
   2.902 +                   'void', 
   2.903 +                   [param('std::list< unsigned int, std::allocator< unsigned int > >&', 'packetlist', is_const=True)])
   2.904      ## error-model.h: bool ns3::ListErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
   2.905 -    cls.add_method('DoCorrupt', 'bool', [param('ns3::Ptr< ns3::Packet >', 'p')], visibility='private', is_virtual=True)
   2.906 +    cls.add_method('DoCorrupt', 
   2.907 +                   'bool', 
   2.908 +                   [param('ns3::Ptr< ns3::Packet >', 'p')], 
   2.909 +                   visibility='private', is_virtual=True)
   2.910      ## error-model.h: void ns3::ListErrorModel::DoReset() [member function]
   2.911 -    cls.add_method('DoReset', 'void', [], visibility='private', is_virtual=True)
   2.912 +    cls.add_method('DoReset', 
   2.913 +                   'void', 
   2.914 +                   [], 
   2.915 +                   visibility='private', is_virtual=True)
   2.916      return
   2.917  
   2.918  def register_Ns3DataRateValue_methods(root_module, cls):
   2.919      ## data-rate.h: ns3::DataRateValue::DataRateValue() [constructor]
   2.920 -    cls.add_constructor([], visibility='public')
   2.921 +    cls.add_constructor([])
   2.922      ## data-rate.h: ns3::DataRateValue::DataRateValue(ns3::DataRate const & value) [constructor]
   2.923 -    cls.add_constructor([param('ns3::DataRate&', 'value', is_const=True)], visibility='public')
   2.924 +    cls.add_constructor([param('ns3::DataRate&', 'value', is_const=True)])
   2.925      ## data-rate.h: void ns3::DataRateValue::Set(ns3::DataRate const & value) [member function]
   2.926 -    cls.add_method('Set', 'void', [param('ns3::DataRate&', 'value', is_const=True)])
   2.927 +    cls.add_method('Set', 
   2.928 +                   'void', 
   2.929 +                   [param('ns3::DataRate&', 'value', is_const=True)])
   2.930      ## data-rate.h: ns3::DataRate ns3::DataRateValue::Get() const [member function]
   2.931 -    cls.add_method('Get', 'ns3::DataRate', [], is_const=True)
   2.932 +    cls.add_method('Get', 
   2.933 +                   'ns3::DataRate', 
   2.934 +                   [], 
   2.935 +                   is_const=True)
   2.936      ## data-rate.h: ns3::Ptr<ns3::AttributeValue> ns3::DataRateValue::Copy() const [member function]
   2.937 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
   2.938 +    cls.add_method('Copy', 
   2.939 +                   'ns3::Ptr< ns3::AttributeValue >', 
   2.940 +                   [], 
   2.941 +                   is_const=True, is_virtual=True)
   2.942      ## data-rate.h: std::string ns3::DataRateValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
   2.943 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
   2.944 +    cls.add_method('SerializeToString', 
   2.945 +                   'std::string', 
   2.946 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   2.947 +                   is_const=True, is_virtual=True)
   2.948      ## data-rate.h: bool ns3::DataRateValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
   2.949 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
   2.950 +    cls.add_method('DeserializeFromString', 
   2.951 +                   'bool', 
   2.952 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   2.953 +                   is_virtual=True)
   2.954      return
   2.955  
   2.956  def register_Ns3RateErrorModel_methods(root_module, cls):
   2.957      ## error-model.h: static ns3::TypeId ns3::RateErrorModel::GetTypeId() [member function]
   2.958 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   2.959 +    cls.add_method('GetTypeId', 
   2.960 +                   'ns3::TypeId', 
   2.961 +                   [], 
   2.962 +                   is_static=True)
   2.963      ## error-model.h: ns3::RateErrorModel::RateErrorModel() [constructor]
   2.964 -    cls.add_constructor([], visibility='public')
   2.965 +    cls.add_constructor([])
   2.966      ## error-model.h: ns3::ErrorUnit ns3::RateErrorModel::GetUnit() const [member function]
   2.967 -    cls.add_method('GetUnit', 'ns3::ErrorUnit', [], is_const=True)
   2.968 +    cls.add_method('GetUnit', 
   2.969 +                   'ns3::ErrorUnit', 
   2.970 +                   [], 
   2.971 +                   is_const=True)
   2.972      ## error-model.h: void ns3::RateErrorModel::SetUnit(ns3::ErrorUnit error_unit) [member function]
   2.973 -    cls.add_method('SetUnit', 'void', [param('ns3::ErrorUnit', 'error_unit')])
   2.974 +    cls.add_method('SetUnit', 
   2.975 +                   'void', 
   2.976 +                   [param('ns3::ErrorUnit', 'error_unit')])
   2.977      ## error-model.h: double ns3::RateErrorModel::GetRate() const [member function]
   2.978 -    cls.add_method('GetRate', 'double', [], is_const=True)
   2.979 +    cls.add_method('GetRate', 
   2.980 +                   'double', 
   2.981 +                   [], 
   2.982 +                   is_const=True)
   2.983      ## error-model.h: void ns3::RateErrorModel::SetRate(double rate) [member function]
   2.984 -    cls.add_method('SetRate', 'void', [param('double', 'rate')])
   2.985 +    cls.add_method('SetRate', 
   2.986 +                   'void', 
   2.987 +                   [param('double', 'rate')])
   2.988      ## error-model.h: void ns3::RateErrorModel::SetRandomVariable(ns3::RandomVariable const & ranvar) [member function]
   2.989 -    cls.add_method('SetRandomVariable', 'void', [param('ns3::RandomVariable&', 'ranvar', is_const=True)])
   2.990 +    cls.add_method('SetRandomVariable', 
   2.991 +                   'void', 
   2.992 +                   [param('ns3::RandomVariable&', 'ranvar', is_const=True)])
   2.993      ## error-model.h: bool ns3::RateErrorModel::DoCorrupt(ns3::Ptr<ns3::Packet> p) [member function]
   2.994 -    cls.add_method('DoCorrupt', 'bool', [param('ns3::Ptr< ns3::Packet >', 'p')], visibility='private', is_virtual=True)
   2.995 +    cls.add_method('DoCorrupt', 
   2.996 +                   'bool', 
   2.997 +                   [param('ns3::Ptr< ns3::Packet >', 'p')], 
   2.998 +                   visibility='private', is_virtual=True)
   2.999      ## error-model.h: bool ns3::RateErrorModel::DoCorruptPkt(ns3::Ptr<ns3::Packet> p) [member function]
  2.1000 -    cls.add_method('DoCorruptPkt', 'bool', [param('ns3::Ptr< ns3::Packet >', 'p')], visibility='private', is_virtual=True)
  2.1001 +    cls.add_method('DoCorruptPkt', 
  2.1002 +                   'bool', 
  2.1003 +                   [param('ns3::Ptr< ns3::Packet >', 'p')], 
  2.1004 +                   visibility='private', is_virtual=True)
  2.1005      ## error-model.h: bool ns3::RateErrorModel::DoCorruptByte(ns3::Ptr<ns3::Packet> p) [member function]
  2.1006 -    cls.add_method('DoCorruptByte', 'bool', [param('ns3::Ptr< ns3::Packet >', 'p')], visibility='private', is_virtual=True)
  2.1007 +    cls.add_method('DoCorruptByte', 
  2.1008 +                   'bool', 
  2.1009 +                   [param('ns3::Ptr< ns3::Packet >', 'p')], 
  2.1010 +                   visibility='private', is_virtual=True)
  2.1011      ## error-model.h: bool ns3::RateErrorModel::DoCorruptBit(ns3::Ptr<ns3::Packet> p) [member function]
  2.1012 -    cls.add_method('DoCorruptBit', 'bool', [param('ns3::Ptr< ns3::Packet >', 'p')], visibility='private', is_virtual=True)
  2.1013 +    cls.add_method('DoCorruptBit', 
  2.1014 +                   'bool', 
  2.1015 +                   [param('ns3::Ptr< ns3::Packet >', 'p')], 
  2.1016 +                   visibility='private', is_virtual=True)
  2.1017      ## error-model.h: void ns3::RateErrorModel::DoReset() [member function]
  2.1018 -    cls.add_method('DoReset', 'void', [], visibility='private', is_virtual=True)
  2.1019 +    cls.add_method('DoReset', 
  2.1020 +                   'void', 
  2.1021 +                   [], 
  2.1022 +                   visibility='private', is_virtual=True)
  2.1023      return
  2.1024  
  2.1025  def register_functions(root_module):
  2.1026      module = root_module
  2.1027      ## data-rate.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeDataRateChecker() [free function]
  2.1028 -    module.add_function('MakeDataRateChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [])
  2.1029 +    module.add_function('MakeDataRateChecker', 
  2.1030 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  2.1031 +                        [])
  2.1032      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
  2.1033      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
  2.1034      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
     3.1 --- a/bindings/python/ns3_module_contrib.py	Mon Jul 21 11:43:05 2008 +0100
     3.2 +++ b/bindings/python/ns3_module_contrib.py	Mon Jul 21 15:30:15 2008 +0100
     3.3 @@ -1,4 +1,4 @@
     3.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     3.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     3.6  
     3.7  def register_types(module):
     3.8      root_module = module.get_root()
     3.9 @@ -71,66 +71,103 @@
    3.10  
    3.11  def register_Ns3Gnuplot_methods(root_module, cls):
    3.12      ## gnuplot.h: ns3::Gnuplot::Gnuplot(std::string pngFilename) [constructor]
    3.13 -    cls.add_constructor([param('std::string', 'pngFilename')], visibility='public')
    3.14 +    cls.add_constructor([param('std::string', 'pngFilename')])
    3.15      ## gnuplot.h: void ns3::Gnuplot::SetLegend(std::string xLegend, std::string yLegend) [member function]
    3.16 -    cls.add_method('SetLegend', 'void', [param('std::string', 'xLegend'), param('std::string', 'yLegend')])
    3.17 +    cls.add_method('SetLegend', 
    3.18 +                   'void', 
    3.19 +                   [param('std::string', 'xLegend'), param('std::string', 'yLegend')])
    3.20      ## gnuplot.h: void ns3::Gnuplot::AddDataset(ns3::GnuplotDataset const & dataset) [member function]
    3.21 -    cls.add_method('AddDataset', 'void', [param('ns3::GnuplotDataset&', 'dataset', is_const=True)])
    3.22 +    cls.add_method('AddDataset', 
    3.23 +                   'void', 
    3.24 +                   [param('ns3::GnuplotDataset&', 'dataset', is_const=True)])
    3.25      ## gnuplot.h: void ns3::Gnuplot::GenerateOutput(std::ostream & os) [member function]
    3.26 -    cls.add_method('GenerateOutput', 'void', [param('std::ostream&', 'os')])
    3.27 +    cls.add_method('GenerateOutput', 
    3.28 +                   'void', 
    3.29 +                   [param('std::ostream&', 'os')])
    3.30      return
    3.31  
    3.32  def register_Ns3EventGarbageCollector_methods(root_module, cls):
    3.33      ## event-garbage-collector.h: ns3::EventGarbageCollector::EventGarbageCollector() [constructor]
    3.34 -    cls.add_constructor([], visibility='public')
    3.35 +    cls.add_constructor([])
    3.36      ## event-garbage-collector.h: void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function]
    3.37 -    cls.add_method('Track', 'void', [param('ns3::EventId', 'event')])
    3.38 +    cls.add_method('Track', 
    3.39 +                   'void', 
    3.40 +                   [param('ns3::EventId', 'event')])
    3.41      return
    3.42  
    3.43  def register_Ns3GnuplotDataset_methods(root_module, cls):
    3.44      ## gnuplot.h: ns3::GnuplotDataset::GnuplotDataset() [constructor]
    3.45 -    cls.add_constructor([], visibility='public')
    3.46 +    cls.add_constructor([])
    3.47      ## gnuplot.h: ns3::GnuplotDataset::GnuplotDataset(std::string title) [constructor]
    3.48 -    cls.add_constructor([param('std::string', 'title')], visibility='public')
    3.49 +    cls.add_constructor([param('std::string', 'title')])
    3.50      ## gnuplot.h: void ns3::GnuplotDataset::SetStyle(ns3::GnuplotDataset::Style style) [member function]
    3.51 -    cls.add_method('SetStyle', 'void', [param('ns3::GnuplotDataset::Style', 'style')])
    3.52 +    cls.add_method('SetStyle', 
    3.53 +                   'void', 
    3.54 +                   [param('ns3::GnuplotDataset::Style', 'style')])
    3.55      ## gnuplot.h: void ns3::GnuplotDataset::SetErrorBars(ns3::GnuplotDataset::ErrorBars errorBars) [member function]
    3.56 -    cls.add_method('SetErrorBars', 'void', [param('ns3::GnuplotDataset::ErrorBars', 'errorBars')])
    3.57 +    cls.add_method('SetErrorBars', 
    3.58 +                   'void', 
    3.59 +                   [param('ns3::GnuplotDataset::ErrorBars', 'errorBars')])
    3.60      ## gnuplot.h: void ns3::GnuplotDataset::Add(double x, double y) [member function]
    3.61 -    cls.add_method('Add', 'void', [param('double', 'x'), param('double', 'y')])
    3.62 +    cls.add_method('Add', 
    3.63 +                   'void', 
    3.64 +                   [param('double', 'x'), param('double', 'y')])
    3.65      ## gnuplot.h: void ns3::GnuplotDataset::Add(double x, double y, double errorDelta) [member function]
    3.66 -    cls.add_method('Add', 'void', [param('double', 'x'), param('double', 'y'), param('double', 'errorDelta')])
    3.67 +    cls.add_method('Add', 
    3.68 +                   'void', 
    3.69 +                   [param('double', 'x'), param('double', 'y'), param('double', 'errorDelta')])
    3.70      return
    3.71  
    3.72  def register_Ns3GtkConfigStore_methods(root_module, cls):
    3.73      ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor]
    3.74 -    cls.add_constructor([], visibility='public')
    3.75 +    cls.add_constructor([])
    3.76      ## gtk-config-store.h: void ns3::GtkConfigStore::Configure() [member function]
    3.77 -    cls.add_method('Configure', 'void', [])
    3.78 +    cls.add_method('Configure', 
    3.79 +                   'void', 
    3.80 +                   [])
    3.81      return
    3.82  
    3.83  def register_Ns3ConfigStore_methods(root_module, cls):
    3.84      ## config-store.h: static ns3::TypeId ns3::ConfigStore::GetTypeId() [member function]
    3.85 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
    3.86 +    cls.add_method('GetTypeId', 
    3.87 +                   'ns3::TypeId', 
    3.88 +                   [], 
    3.89 +                   is_static=True)
    3.90      ## config-store.h: ns3::TypeId ns3::ConfigStore::GetInstanceTypeId() const [member function]
    3.91 -    cls.add_method('GetInstanceTypeId', 'ns3::TypeId', [], is_const=True, is_virtual=True)
    3.92 +    cls.add_method('GetInstanceTypeId', 
    3.93 +                   'ns3::TypeId', 
    3.94 +                   [], 
    3.95 +                   is_const=True, is_virtual=True)
    3.96      ## config-store.h: ns3::ConfigStore::ConfigStore() [constructor]
    3.97 -    cls.add_constructor([], visibility='public')
    3.98 +    cls.add_constructor([])
    3.99      ## config-store.h: void ns3::ConfigStore::Configure() [member function]
   3.100 -    cls.add_method('Configure', 'void', [])
   3.101 +    cls.add_method('Configure', 
   3.102 +                   'void', 
   3.103 +                   [])
   3.104      return
   3.105  
   3.106  def register_Ns3DelayJitterEstimation_methods(root_module, cls):
   3.107      ## delay-jitter-estimation.h: ns3::DelayJitterEstimation::DelayJitterEstimation() [constructor]
   3.108 -    cls.add_constructor([], visibility='public')
   3.109 +    cls.add_constructor([])
   3.110      ## delay-jitter-estimation.h: static void ns3::DelayJitterEstimation::PrepareTx(ns3::Ptr<const ns3::Packet> packet) [member function]
   3.111 -    cls.add_method('PrepareTx', 'void', [param('ns3::Ptr< const ns3::Packet >', 'packet')], is_static=True)
   3.112 +    cls.add_method('PrepareTx', 
   3.113 +                   'void', 
   3.114 +                   [param('ns3::Ptr< const ns3::Packet >', 'packet')], 
   3.115 +                   is_static=True)
   3.116      ## delay-jitter-estimation.h: void ns3::DelayJitterEstimation::RecordRx(ns3::Ptr<const ns3::Packet> packet) [member function]
   3.117 -    cls.add_method('RecordRx', 'void', [param('ns3::Ptr< const ns3::Packet >', 'packet')])
   3.118 +    cls.add_method('RecordRx', 
   3.119 +                   'void', 
   3.120 +                   [param('ns3::Ptr< const ns3::Packet >', 'packet')])
   3.121      ## delay-jitter-estimation.h: ns3::Time ns3::DelayJitterEstimation::GetLastDelay() const [member function]
   3.122 -    cls.add_method('GetLastDelay', 'ns3::Time', [], is_const=True)
   3.123 +    cls.add_method('GetLastDelay', 
   3.124 +                   'ns3::Time', 
   3.125 +                   [], 
   3.126 +                   is_const=True)
   3.127      ## delay-jitter-estimation.h: ns3::Time ns3::DelayJitterEstimation::GetLastJitter() const [member function]
   3.128 -    cls.add_method('GetLastJitter', 'ns3::Time', [], is_const=True)
   3.129 +    cls.add_method('GetLastJitter', 
   3.130 +                   'ns3::Time', 
   3.131 +                   [], 
   3.132 +                   is_const=True)
   3.133      return
   3.134  
   3.135  def register_functions(root_module):
     4.1 --- a/bindings/python/ns3_module_core.py	Mon Jul 21 11:43:05 2008 +0100
     4.2 +++ b/bindings/python/ns3_module_core.py	Mon Jul 21 15:30:15 2008 +0100
     4.3 @@ -1,4 +1,4 @@
     4.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     4.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     4.6  
     4.7  def register_types(module):
     4.8      root_module = module.get_root()
     4.9 @@ -10,7 +10,7 @@
    4.10      ## global-value.h: ns3::GlobalValue [class]
    4.11      module.add_class('GlobalValue')
    4.12      ## ref-count-base.h: ns3::RefCountBase [class]
    4.13 -    module.add_class('RefCountBase', incref_method='Ref', automatic_type_narrowing=True, decref_method='Unref', peekref_method='GetReferenceCount')
    4.14 +    module.add_class('RefCountBase', automatic_type_narrowing=True, memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
    4.15      ## type-id.h: ns3::TypeId [class]
    4.16      module.add_class('TypeId')
    4.17      ## type-id.h: ns3::TypeId::AttributeFlag [enumeration]
    4.18 @@ -20,13 +20,13 @@
    4.19      ## system-wall-clock-ms.h: ns3::SystemWallClockMs [class]
    4.20      module.add_class('SystemWallClockMs')
    4.21      ## callback.h: ns3::CallbackImplBase [class]
    4.22 -    module.add_class('CallbackImplBase', incref_method='Ref', allow_subclassing=True, decref_method='Unref', peekref_method='GetReferenceCount')
    4.23 +    module.add_class('CallbackImplBase', allow_subclassing=True, memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
    4.24      ## system-mutex.h: ns3::CriticalSection [class]
    4.25      module.add_class('CriticalSection')
    4.26      ## trace-source-accessor.h: ns3::TraceSourceAccessor [class]
    4.27      module.add_class('TraceSourceAccessor', allow_subclassing=True)
    4.28      ## attribute.h: ns3::AttributeChecker [class]
    4.29 -    module.add_class('AttributeChecker', incref_method='Ref', allow_subclassing=False, automatic_type_narrowing=True, decref_method='Unref', parent=root_module['ns3::RefCountBase'])
    4.30 +    module.add_class('AttributeChecker', allow_subclassing=False, automatic_type_narrowing=True, parent=root_module['ns3::RefCountBase'])
    4.31      ## random-variable.h: ns3::RandomVariableChecker [class]
    4.32      module.add_class('RandomVariableChecker', parent=root_module['ns3::AttributeChecker'])
    4.33      ## system-mutex.h: ns3::SystemMutex [class]
    4.34 @@ -120,11 +120,11 @@
    4.35      ## attribute-list.h: ns3::AttributeList [class]
    4.36      module.add_class('AttributeList')
    4.37      ## attribute.h: ns3::AttributeValue [class]
    4.38 -    module.add_class('AttributeValue', incref_method='Ref', allow_subclassing=False, automatic_type_narrowing=True, decref_method='Unref', parent=root_module['ns3::RefCountBase'])
    4.39 +    module.add_class('AttributeValue', allow_subclassing=False, automatic_type_narrowing=True, parent=root_module['ns3::RefCountBase'])
    4.40      ## random-variable.h: ns3::UniformVariable [class]
    4.41      module.add_class('UniformVariable', parent=root_module['ns3::RandomVariable'])
    4.42      ## object.h: ns3::Object [class]
    4.43 -    module.add_class('Object', incref_method='Ref', automatic_type_narrowing=True, decref_method='Unref', parent=root_module['ns3::ObjectBase'], peekref_method='GetReferenceCount')
    4.44 +    module.add_class('Object', automatic_type_narrowing=True, parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
    4.45      ## object.h: ns3::Object::AggregateIterator [class]
    4.46      module.add_class('AggregateIterator', outer_class=root_module['ns3::Object'])
    4.47      ## system-condition.h: ns3::SystemCondition [class]
    4.48 @@ -298,138 +298,280 @@
    4.49  
    4.50  def register_Ns3RandomVariable_methods(root_module, cls):
    4.51      ## random-variable.h: ns3::RandomVariable::RandomVariable() [constructor]
    4.52 -    cls.add_constructor([], visibility='public')
    4.53 +    cls.add_constructor([])
    4.54      ## random-variable.h: ns3::RandomVariable::RandomVariable(ns3::RandomVariable const & o) [copy constructor]
    4.55 -    cls.add_constructor([param('ns3::RandomVariable&', 'o', is_const=True)], visibility='public')
    4.56 +    cls.add_constructor([param('ns3::RandomVariable&', 'o', is_const=True)])
    4.57      ## random-variable.h: uint32_t ns3::RandomVariable::GetInteger() const [member function]
    4.58 -    cls.add_method('GetInteger', 'uint32_t', [], is_const=True)
    4.59 +    cls.add_method('GetInteger', 
    4.60 +                   'uint32_t', 
    4.61 +                   [], 
    4.62 +                   is_const=True)
    4.63      ## random-variable.h: void ns3::RandomVariable::GetSeed(uint32_t * seed) const [member function]
    4.64 -    cls.add_method('GetSeed', 'void', [param('uint32_t *', 'seed', direction=2, array_length=6)], is_const=True)
    4.65 +    cls.add_method('GetSeed', 
    4.66 +                   'void', 
    4.67 +                   [param('uint32_t *', 'seed', direction=2, array_length=6)], 
    4.68 +                   is_const=True)
    4.69      ## random-variable.h: double ns3::RandomVariable::GetValue() const [member function]
    4.70 -    cls.add_method('GetValue', 'double', [], is_const=True)
    4.71 +    cls.add_method('GetValue', 
    4.72 +                   'double', 
    4.73 +                   [], 
    4.74 +                   is_const=True)
    4.75      ## random-variable.h: static void ns3::RandomVariable::SetRunNumber(uint32_t n) [member function]
    4.76 -    cls.add_method('SetRunNumber', 'void', [param('uint32_t', 'n')], is_static=True)
    4.77 +    cls.add_method('SetRunNumber', 
    4.78 +                   'void', 
    4.79 +                   [param('uint32_t', 'n')], 
    4.80 +                   is_static=True)
    4.81      ## random-variable.h: static void ns3::RandomVariable::UseDevRandom(bool udr=true) [member function]
    4.82 -    cls.add_method('UseDevRandom', 'void', [param('bool', 'udr', default_value='true')], is_static=True)
    4.83 +    cls.add_method('UseDevRandom', 
    4.84 +                   'void', 
    4.85 +                   [param('bool', 'udr', default_value='true')], 
    4.86 +                   is_static=True)
    4.87      ## random-variable.h: static void ns3::RandomVariable::UseGlobalSeed(uint32_t s0, uint32_t s1, uint32_t s2, uint32_t s3, uint32_t s4, uint32_t s5) [member function]
    4.88 -    cls.add_method('UseGlobalSeed', 'void', [param('uint32_t', 's0'), param('uint32_t', 's1'), param('uint32_t', 's2'), param('uint32_t', 's3'), param('uint32_t', 's4'), param('uint32_t', 's5')], is_static=True)
    4.89 +    cls.add_method('UseGlobalSeed', 
    4.90 +                   'void', 
    4.91 +                   [param('uint32_t', 's0'), param('uint32_t', 's1'), param('uint32_t', 's2'), param('uint32_t', 's3'), param('uint32_t', 's4'), param('uint32_t', 's5')], 
    4.92 +                   is_static=True)
    4.93      cls.add_output_stream_operator()
    4.94      return
    4.95  
    4.96  def register_Ns3TriangularVariable_methods(root_module, cls):
    4.97      ## random-variable.h: ns3::TriangularVariable::TriangularVariable() [constructor]
    4.98 -    cls.add_constructor([], visibility='public')
    4.99 +    cls.add_constructor([])
   4.100      ## random-variable.h: ns3::TriangularVariable::TriangularVariable(double s, double l, double mean) [constructor]
   4.101 -    cls.add_constructor([param('double', 's'), param('double', 'l'), param('double', 'mean')], visibility='public')
   4.102 +    cls.add_constructor([param('double', 's'), param('double', 'l'), param('double', 'mean')])
   4.103      ## random-variable.h: static double ns3::TriangularVariable::GetSingleValue(double s, double l, double mean) [member function]
   4.104 -    cls.add_method('GetSingleValue', 'double', [param('double', 's'), param('double', 'l'), param('double', 'mean')], is_static=True)
   4.105 +    cls.add_method('GetSingleValue', 
   4.106 +                   'double', 
   4.107 +                   [param('double', 's'), param('double', 'l'), param('double', 'mean')], 
   4.108 +                   is_static=True)
   4.109      return
   4.110  
   4.111  def register_Ns3GlobalValue_methods(root_module, cls):
   4.112      ## global-value.h: ns3::GlobalValue::GlobalValue(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeChecker const> checker) [constructor]
   4.113 -    cls.add_constructor([param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue&', 'initialValue', is_const=True), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], visibility='public')
   4.114 +    cls.add_constructor([param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue&', 'initialValue', is_const=True), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
   4.115      ## global-value.h: std::string ns3::GlobalValue::GetName() const [member function]
   4.116 -    cls.add_method('GetName', 'std::string', [], is_const=True)
   4.117 +    cls.add_method('GetName', 
   4.118 +                   'std::string', 
   4.119 +                   [], 
   4.120 +                   is_const=True)
   4.121      ## global-value.h: std::string ns3::GlobalValue::GetHelp() const [member function]
   4.122 -    cls.add_method('GetHelp', 'std::string', [], is_const=True)
   4.123 +    cls.add_method('GetHelp', 
   4.124 +                   'std::string', 
   4.125 +                   [], 
   4.126 +                   is_const=True)
   4.127      ## global-value.h: void ns3::GlobalValue::GetValue(ns3::AttributeValue & value) const [member function]
   4.128 -    cls.add_method('GetValue', 'void', [param('ns3::AttributeValue&', 'value')], is_const=True)
   4.129 +    cls.add_method('GetValue', 
   4.130 +                   'void', 
   4.131 +                   [param('ns3::AttributeValue&', 'value')], 
   4.132 +                   is_const=True)
   4.133      ## global-value.h: ns3::Ptr<ns3::AttributeChecker const> ns3::GlobalValue::GetChecker() const [member function]
   4.134 -    cls.add_method('GetChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [], is_const=True)
   4.135 +    cls.add_method('GetChecker', 
   4.136 +                   'ns3::Ptr< ns3::AttributeChecker const >', 
   4.137 +                   [], 
   4.138 +                   is_const=True)
   4.139      ## global-value.h: bool ns3::GlobalValue::SetValue(ns3::AttributeValue const & value) [member function]
   4.140 -    cls.add_method('SetValue', 'bool', [param('ns3::AttributeValue&', 'value', is_const=True)])
   4.141 +    cls.add_method('SetValue', 
   4.142 +                   'bool', 
   4.143 +                   [param('ns3::AttributeValue&', 'value', is_const=True)])
   4.144      ## global-value.h: static void ns3::GlobalValue::Bind(std::string name, ns3::AttributeValue const & value) [member function]
   4.145 -    cls.add_method('Bind', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)], is_static=True)
   4.146 +    cls.add_method('Bind', 
   4.147 +                   'void', 
   4.148 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)], 
   4.149 +                   is_static=True)
   4.150      ## global-value.h: static bool ns3::GlobalValue::BindFailSafe(std::string name, ns3::AttributeValue const & value) [member function]
   4.151 -    cls.add_method('BindFailSafe', 'bool', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)], is_static=True)
   4.152 +    cls.add_method('BindFailSafe', 
   4.153 +                   'bool', 
   4.154 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)], 
   4.155 +                   is_static=True)
   4.156      ## global-value.h: static __gnu_cxx::__normal_iterator<ns3::GlobalValue* const*,std::vector<ns3::GlobalValue*, std::allocator<ns3::GlobalValue*> > > ns3::GlobalValue::Begin() [member function]
   4.157 -    cls.add_method('Begin', '__gnu_cxx::__normal_iterator< ns3::GlobalValue* const*, std::vector< ns3::GlobalValue*, std::allocator< ns3::GlobalValue* > > >', [], is_static=True)
   4.158 +    cls.add_method('Begin', 
   4.159 +                   '__gnu_cxx::__normal_iterator< ns3::GlobalValue* const*, std::vector< ns3::GlobalValue*, std::allocator< ns3::GlobalValue* > > >', 
   4.160 +                   [], 
   4.161 +                   is_static=True)
   4.162      ## global-value.h: static __gnu_cxx::__normal_iterator<ns3::GlobalValue* const*,std::vector<ns3::GlobalValue*, std::allocator<ns3::GlobalValue*> > > ns3::GlobalValue::End() [member function]
   4.163 -    cls.add_method('End', '__gnu_cxx::__normal_iterator< ns3::GlobalValue* const*, std::vector< ns3::GlobalValue*, std::allocator< ns3::GlobalValue* > > >', [], is_static=True)
   4.164 +    cls.add_method('End', 
   4.165 +                   '__gnu_cxx::__normal_iterator< ns3::GlobalValue* const*, std::vector< ns3::GlobalValue*, std::allocator< ns3::GlobalValue* > > >', 
   4.166 +                   [], 
   4.167 +                   is_static=True)
   4.168      return
   4.169  
   4.170  def register_Ns3RefCountBase_methods(root_module, cls):
   4.171      ## ref-count-base.h: ns3::RefCountBase::RefCountBase() [constructor]
   4.172 -    cls.add_constructor([], visibility='public')
   4.173 +    cls.add_constructor([])
   4.174      ## ref-count-base.h: ns3::RefCountBase::RefCountBase(ns3::RefCountBase const & o) [copy constructor]
   4.175 -    cls.add_constructor([param('ns3::RefCountBase&', 'o', is_const=True)], visibility='public')
   4.176 +    cls.add_constructor([param('ns3::RefCountBase&', 'o', is_const=True)])
   4.177      return
   4.178  
   4.179  def register_Ns3TypeId_methods(root_module, cls):
   4.180      ## type-id.h: ns3::TypeId::TypeId(ns3::TypeId const & arg0) [copy constructor]
   4.181 -    cls.add_constructor([param('ns3::TypeId&', 'arg0', is_const=True)], visibility='public')
   4.182 +    cls.add_constructor([param('ns3::TypeId&', 'arg0', is_const=True)])
   4.183      ## type-id.h: ns3::TypeId::TypeId(char const * name) [constructor]
   4.184 -    cls.add_constructor([param('char *', 'name', transfer_ownership=False, is_const=True)], visibility='public')
   4.185 +    cls.add_constructor([param('char *', 'name', transfer_ownership=False, is_const=True)])
   4.186      ## type-id.h: ns3::TypeId::TypeId() [constructor]
   4.187 -    cls.add_constructor([], visibility='public')
   4.188 +    cls.add_constructor([])
   4.189      ## type-id.h: ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
   4.190 -    cls.add_method('AddAttribute', 'ns3::TypeId', [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue&', 'initialValue', is_const=True), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
   4.191 +    cls.add_method('AddAttribute', 
   4.192 +                   'ns3::TypeId', 
   4.193 +                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue&', 'initialValue', is_const=True), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
   4.194      ## type-id.h: ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
   4.195 -    cls.add_method('AddAttribute', 'ns3::TypeId', [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue&', 'initialValue', is_const=True), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
   4.196 +    cls.add_method('AddAttribute', 
   4.197 +                   'ns3::TypeId', 
   4.198 +                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue&', 'initialValue', is_const=True), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])
   4.199      ## type-id.h: ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]
   4.200 -    cls.add_method('AddTraceSource', 'ns3::TypeId', [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')])
   4.201 +    cls.add_method('AddTraceSource', 
   4.202 +                   'ns3::TypeId', 
   4.203 +                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')])
   4.204      ## type-id.h: ns3::Ptr<ns3::AttributeAccessor const> ns3::TypeId::GetAttributeAccessor(uint32_t i) const [member function]
   4.205 -    cls.add_method('GetAttributeAccessor', 'ns3::Ptr< ns3::AttributeAccessor const >', [param('uint32_t', 'i')], is_const=True)
   4.206 +    cls.add_method('GetAttributeAccessor', 
   4.207 +                   'ns3::Ptr< ns3::AttributeAccessor const >', 
   4.208 +                   [param('uint32_t', 'i')], 
   4.209 +                   is_const=True)
   4.210      ## type-id.h: ns3::Ptr<ns3::AttributeChecker const> ns3::TypeId::GetAttributeChecker(uint32_t i) const [member function]
   4.211 -    cls.add_method('GetAttributeChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [param('uint32_t', 'i')], is_const=True)
   4.212 +    cls.add_method('GetAttributeChecker', 
   4.213 +                   'ns3::Ptr< ns3::AttributeChecker const >', 
   4.214 +                   [param('uint32_t', 'i')], 
   4.215 +                   is_const=True)
   4.216      ## type-id.h: uint32_t ns3::TypeId::GetAttributeFlags(uint32_t i) const [member function]
   4.217 -    cls.add_method('GetAttributeFlags', 'uint32_t', [param('uint32_t', 'i')], is_const=True)
   4.218 +    cls.add_method('GetAttributeFlags', 
   4.219 +                   'uint32_t', 
   4.220 +                   [param('uint32_t', 'i')], 
   4.221 +                   is_const=True)
   4.222      ## type-id.h: std::string ns3::TypeId::GetAttributeFullName(uint32_t i) const [member function]
   4.223 -    cls.add_method('GetAttributeFullName', 'std::string', [param('uint32_t', 'i')], is_const=True)
   4.224 +    cls.add_method('GetAttributeFullName', 
   4.225 +                   'std::string', 
   4.226 +                   [param('uint32_t', 'i')], 
   4.227 +                   is_const=True)
   4.228      ## type-id.h: std::string ns3::TypeId::GetAttributeHelp(uint32_t i) const [member function]
   4.229 -    cls.add_method('GetAttributeHelp', 'std::string', [param('uint32_t', 'i')], is_const=True)
   4.230 +    cls.add_method('GetAttributeHelp', 
   4.231 +                   'std::string', 
   4.232 +                   [param('uint32_t', 'i')], 
   4.233 +                   is_const=True)
   4.234      ## type-id.h: ns3::Ptr<ns3::AttributeValue const> ns3::TypeId::GetAttributeInitialValue(uint32_t i) const [member function]
   4.235 -    cls.add_method('GetAttributeInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', [param('uint32_t', 'i')], is_const=True)
   4.236 +    cls.add_method('GetAttributeInitialValue', 
   4.237 +                   'ns3::Ptr< ns3::AttributeValue const >', 
   4.238 +                   [param('uint32_t', 'i')], 
   4.239 +                   is_const=True)
   4.240      ## type-id.h: uint32_t ns3::TypeId::GetAttributeN() const [member function]
   4.241 -    cls.add_method('GetAttributeN', 'uint32_t', [], is_const=True)
   4.242 +    cls.add_method('GetAttributeN', 
   4.243 +                   'uint32_t', 
   4.244 +                   [], 
   4.245 +                   is_const=True)
   4.246      ## type-id.h: std::string ns3::TypeId::GetAttributeName(uint32_t i) const [member function]
   4.247 -    cls.add_method('GetAttributeName', 'std::string', [param('uint32_t', 'i')], is_const=True)
   4.248 +    cls.add_method('GetAttributeName', 
   4.249 +                   'std::string', 
   4.250 +                   [param('uint32_t', 'i')], 
   4.251 +                   is_const=True)
   4.252      ## type-id.h: ns3::Callback<ns3::ObjectBase*,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::TypeId::GetConstructor() const [member function]
   4.253 -    cls.add_method('GetConstructor', 'ns3::Callback< ns3::ObjectBase*, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', [], is_const=True)
   4.254 +    cls.add_method('GetConstructor', 
   4.255 +                   'ns3::Callback< ns3::ObjectBase*, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 
   4.256 +                   [], 
   4.257 +                   is_const=True)
   4.258      ## type-id.h: std::string ns3::TypeId::GetGroupName() const [member function]
   4.259 -    cls.add_method('GetGroupName', 'std::string', [], is_const=True)
   4.260 +    cls.add_method('GetGroupName', 
   4.261 +                   'std::string', 
   4.262 +                   [], 
   4.263 +                   is_const=True)
   4.264      ## type-id.h: std::string ns3::TypeId::GetName() const [member function]
   4.265 -    cls.add_method('GetName', 'std::string', [], is_const=True)
   4.266 +    cls.add_method('GetName', 
   4.267 +                   'std::string', 
   4.268 +                   [], 
   4.269 +                   is_const=True)
   4.270      ## type-id.h: ns3::TypeId ns3::TypeId::GetParent() const [member function]
   4.271 -    cls.add_method('GetParent', 'ns3::TypeId', [], is_const=True)
   4.272 +    cls.add_method('GetParent', 
   4.273 +                   'ns3::TypeId', 
   4.274 +                   [], 
   4.275 +                   is_const=True)
   4.276      ## type-id.h: static ns3::TypeId ns3::TypeId::GetRegistered(uint32_t i) [member function]
   4.277 -    cls.add_method('GetRegistered', 'ns3::TypeId', [param('uint32_t', 'i')], is_static=True)
   4.278 +    cls.add_method('GetRegistered', 
   4.279 +                   'ns3::TypeId', 
   4.280 +                   [param('uint32_t', 'i')], 
   4.281 +                   is_static=True)
   4.282      ## type-id.h: static uint32_t ns3::TypeId::GetRegisteredN() [member function]
   4.283 -    cls.add_method('GetRegisteredN', 'uint32_t', [], is_static=True)
   4.284 +    cls.add_method('GetRegisteredN', 
   4.285 +                   'uint32_t', 
   4.286 +                   [], 
   4.287 +                   is_static=True)
   4.288      ## type-id.h: ns3::Ptr<ns3::TraceSourceAccessor const> ns3::TypeId::GetTraceSourceAccessor(uint32_t i) const [member function]
   4.289 -    cls.add_method('GetTraceSourceAccessor', 'ns3::Ptr< ns3::TraceSourceAccessor const >', [param('uint32_t', 'i')], is_const=True)
   4.290 +    cls.add_method('GetTraceSourceAccessor', 
   4.291 +                   'ns3::Ptr< ns3::TraceSourceAccessor const >', 
   4.292 +                   [param('uint32_t', 'i')], 
   4.293 +                   is_const=True)
   4.294      ## type-id.h: std::string ns3::TypeId::GetTraceSourceHelp(uint32_t i) const [member function]
   4.295 -    cls.add_method('GetTraceSourceHelp', 'std::string', [param('uint32_t', 'i')], is_const=True)
   4.296 +    cls.add_method('GetTraceSourceHelp', 
   4.297 +                   'std::string', 
   4.298 +                   [param('uint32_t', 'i')], 
   4.299 +                   is_const=True)
   4.300      ## type-id.h: uint32_t ns3::TypeId::GetTraceSourceN() const [member function]
   4.301 -    cls.add_method('GetTraceSourceN', 'uint32_t', [], is_const=True)
   4.302 +    cls.add_method('GetTraceSourceN', 
   4.303 +                   'uint32_t', 
   4.304 +                   [], 
   4.305 +                   is_const=True)
   4.306      ## type-id.h: std::string ns3::TypeId::GetTraceSourceName(uint32_t i) const [member function]
   4.307 -    cls.add_method('GetTraceSourceName', 'std::string', [param('uint32_t', 'i')], is_const=True)
   4.308 +    cls.add_method('GetTraceSourceName', 
   4.309 +                   'std::string', 
   4.310 +                   [param('uint32_t', 'i')], 
   4.311 +                   is_const=True)
   4.312      ## type-id.h: uint16_t ns3::TypeId::GetUid() const [member function]
   4.313 -    cls.add_method('GetUid', 'uint16_t', [], is_const=True)
   4.314 +    cls.add_method('GetUid', 
   4.315 +                   'uint16_t', 
   4.316 +                   [], 
   4.317 +                   is_const=True)
   4.318      ## type-id.h: bool ns3::TypeId::HasConstructor() const [member function]
   4.319 -    cls.add_method('HasConstructor', 'bool', [], is_const=True)
   4.320 +    cls.add_method('HasConstructor', 
   4.321 +                   'bool', 
   4.322 +                   [], 
   4.323 +                   is_const=True)
   4.324      ## type-id.h: bool ns3::TypeId::HasParent() const [member function]
   4.325 -    cls.add_method('HasParent', 'bool', [], is_const=True)
   4.326 +    cls.add_method('HasParent', 
   4.327 +                   'bool', 
   4.328 +                   [], 
   4.329 +                   is_const=True)
   4.330      ## type-id.h: ns3::TypeId ns3::TypeId::HideFromDocumentation() [member function]
   4.331 -    cls.add_method('HideFromDocumentation', 'ns3::TypeId', [])
   4.332 +    cls.add_method('HideFromDocumentation', 
   4.333 +                   'ns3::TypeId', 
   4.334 +                   [])
   4.335      ## type-id.h: bool ns3::TypeId::IsChildOf(ns3::TypeId other) const [member function]
   4.336 -    cls.add_method('IsChildOf', 'bool', [param('ns3::TypeId', 'other')], is_const=True)
   4.337 +    cls.add_method('IsChildOf', 
   4.338 +                   'bool', 
   4.339 +                   [param('ns3::TypeId', 'other')], 
   4.340 +                   is_const=True)
   4.341      ## type-id.h: bool ns3::TypeId::LookupAttributeByName(std::string name, ns3::TypeId::AttributeInfo * info) const [member function]
   4.342 -    cls.add_method('LookupAttributeByName', 'bool', [param('std::string', 'name'), param('ns3::TypeId::AttributeInfo *', 'info', transfer_ownership=False)], is_const=True)
   4.343 +    cls.add_method('LookupAttributeByName', 
   4.344 +                   'bool', 
   4.345 +                   [param('std::string', 'name'), param('ns3::TypeId::AttributeInfo *', 'info', transfer_ownership=False)], 
   4.346 +                   is_const=True)
   4.347      ## type-id.h: static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
   4.348 -    cls.add_method('LookupByName', 'ns3::TypeId', [param('std::string', 'name')], is_static=True)
   4.349 +    cls.add_method('LookupByName', 
   4.350 +                   'ns3::TypeId', 
   4.351 +                   [param('std::string', 'name')], 
   4.352 +                   is_static=True)
   4.353      ## type-id.h: static bool ns3::TypeId::LookupByNameFailSafe(std::string name, ns3::TypeId * tid) [member function]
   4.354 -    cls.add_method('LookupByNameFailSafe', 'bool', [param('std::string', 'name'), param('ns3::TypeId *', 'tid', transfer_ownership=False)], is_static=True)
   4.355 +    cls.add_method('LookupByNameFailSafe', 
   4.356 +                   'bool', 
   4.357 +                   [param('std::string', 'name'), param('ns3::TypeId *', 'tid', transfer_ownership=False)], 
   4.358 +                   is_static=True)
   4.359      ## type-id.h: ns3::Ptr<ns3::TraceSourceAccessor const> ns3::TypeId::LookupTraceSourceByName(std::string name) const [member function]
   4.360 -    cls.add_method('LookupTraceSourceByName', 'ns3::Ptr< ns3::TraceSourceAccessor const >', [param('std::string', 'name')], is_const=True)
   4.361 +    cls.add_method('LookupTraceSourceByName', 
   4.362 +                   'ns3::Ptr< ns3::TraceSourceAccessor const >', 
   4.363 +                   [param('std::string', 'name')], 
   4.364 +                   is_const=True)
   4.365      ## type-id.h: bool ns3::TypeId::MustHideFromDocumentation() const [member function]
   4.366 -    cls.add_method('MustHideFromDocumentation', 'bool', [], is_const=True)
   4.367 +    cls.add_method('MustHideFromDocumentation', 
   4.368 +                   'bool', 
   4.369 +                   [], 
   4.370 +                   is_const=True)
   4.371      ## type-id.h: ns3::TypeId ns3::TypeId::SetGroupName(std::string groupName) [member function]
   4.372 -    cls.add_method('SetGroupName', 'ns3::TypeId', [param('std::string', 'groupName')])
   4.373 +    cls.add_method('SetGroupName', 
   4.374 +                   'ns3::TypeId', 
   4.375 +                   [param('std::string', 'groupName')])
   4.376      ## type-id.h: ns3::TypeId ns3::TypeId::SetParent(ns3::TypeId tid) [member function]
   4.377 -    cls.add_method('SetParent', 'ns3::TypeId', [param('ns3::TypeId', 'tid')])
   4.378 +    cls.add_method('SetParent', 
   4.379 +                   'ns3::TypeId', 
   4.380 +                   [param('ns3::TypeId', 'tid')])
   4.381      ## type-id.h: void ns3::TypeId::SetUid(uint16_t tid) [member function]
   4.382 -    cls.add_method('SetUid', 'void', [param('uint16_t', 'tid')])
   4.383 +    cls.add_method('SetUid', 
   4.384 +                   'void', 
   4.385 +                   [param('uint16_t', 'tid')])
   4.386      cls.add_output_stream_operator()
   4.387      return
   4.388  
   4.389 @@ -447,57 +589,100 @@
   4.390  
   4.391  def register_Ns3SystemWallClockMs_methods(root_module, cls):
   4.392      ## system-wall-clock-ms.h: ns3::SystemWallClockMs::SystemWallClockMs() [constructor]
   4.393 -    cls.add_constructor([], visibility='public')
   4.394 +    cls.add_constructor([])
   4.395      ## system-wall-clock-ms.h: void ns3::SystemWallClockMs::Start() [member function]
   4.396 -    cls.add_method('Start', 'void', [])
   4.397 +    cls.add_method('Start', 
   4.398 +                   'void', 
   4.399 +                   [])
   4.400      ## system-wall-clock-ms.h: long long unsigned int ns3::SystemWallClockMs::End() [member function]
   4.401 -    cls.add_method('End', 'long long unsigned int', [])
   4.402 +    cls.add_method('End', 
   4.403 +                   'long long unsigned int', 
   4.404 +                   [])
   4.405      return
   4.406  
   4.407  def register_Ns3CallbackImplBase_methods(root_module, cls):
   4.408      ## callback.h: ns3::CallbackImplBase::CallbackImplBase() [constructor]
   4.409 -    cls.add_constructor([], visibility='public')
   4.410 +    cls.add_constructor([])
   4.411      ## callback.h: bool ns3::CallbackImplBase::IsEqual(ns3::Ptr<ns3::CallbackImplBase const> other) const [member function]
   4.412 -    cls.add_method('IsEqual', 'bool', [param('ns3::Ptr< ns3::CallbackImplBase const >', 'other')], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.413 +    cls.add_method('IsEqual', 
   4.414 +                   'bool', 
   4.415 +                   [param('ns3::Ptr< ns3::CallbackImplBase const >', 'other')], 
   4.416 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.417      return
   4.418  
   4.419  def register_Ns3CriticalSection_methods(root_module, cls):
   4.420      ## system-mutex.h: ns3::CriticalSection::CriticalSection(ns3::SystemMutex & mutex) [constructor]
   4.421 -    cls.add_constructor([param('ns3::SystemMutex&', 'mutex')], visibility='public')
   4.422 +    cls.add_constructor([param('ns3::SystemMutex&', 'mutex')])
   4.423      return
   4.424  
   4.425  def register_Ns3TraceSourceAccessor_methods(root_module, cls):
   4.426      ## trace-source-accessor.h: ns3::TraceSourceAccessor::TraceSourceAccessor() [constructor]
   4.427 -    cls.add_constructor([], visibility='public')
   4.428 +    cls.add_constructor([])
   4.429      ## trace-source-accessor.h: void ns3::TraceSourceAccessor::Ref() const [member function]
   4.430 -    cls.add_method('Ref', 'void', [], is_const=True)
   4.431 +    cls.add_method('Ref', 
   4.432 +                   'void', 
   4.433 +                   [], 
   4.434 +                   is_const=True)
   4.435      ## trace-source-accessor.h: void ns3::TraceSourceAccessor::Unref() const [member function]
   4.436 -    cls.add_method('Unref', 'void', [], is_const=True)
   4.437 +    cls.add_method('Unref', 
   4.438 +                   'void', 
   4.439 +                   [], 
   4.440 +                   is_const=True)
   4.441      ## trace-source-accessor.h: bool ns3::TraceSourceAccessor::ConnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
   4.442 -    cls.add_method('ConnectWithoutContext', 'bool', [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase&', 'cb', is_const=True)], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.443 +    cls.add_method('ConnectWithoutContext', 
   4.444 +                   'bool', 
   4.445 +                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase&', 'cb', is_const=True)], 
   4.446 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.447      ## trace-source-accessor.h: bool ns3::TraceSourceAccessor::Connect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
   4.448 -    cls.add_method('Connect', 'bool', [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase&', 'cb', is_const=True)], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.449 +    cls.add_method('Connect', 
   4.450 +                   'bool', 
   4.451 +                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase&', 'cb', is_const=True)], 
   4.452 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.453      ## trace-source-accessor.h: bool ns3::TraceSourceAccessor::DisconnectWithoutContext(ns3::ObjectBase * obj, ns3::CallbackBase const & cb) const [member function]
   4.454 -    cls.add_method('DisconnectWithoutContext', 'bool', [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase&', 'cb', is_const=True)], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.455 +    cls.add_method('DisconnectWithoutContext', 
   4.456 +                   'bool', 
   4.457 +                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('ns3::CallbackBase&', 'cb', is_const=True)], 
   4.458 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.459      ## trace-source-accessor.h: bool ns3::TraceSourceAccessor::Disconnect(ns3::ObjectBase * obj, std::string context, ns3::CallbackBase const & cb) const [member function]
   4.460 -    cls.add_method('Disconnect', 'bool', [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase&', 'cb', is_const=True)], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.461 +    cls.add_method('Disconnect', 
   4.462 +                   'bool', 
   4.463 +                   [param('ns3::ObjectBase *', 'obj', transfer_ownership=False), param('std::string', 'context'), param('ns3::CallbackBase&', 'cb', is_const=True)], 
   4.464 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.465      return
   4.466  
   4.467  def register_Ns3AttributeChecker_methods(root_module, cls):
   4.468      ## attribute.h: ns3::AttributeChecker::AttributeChecker() [constructor]
   4.469 -    cls.add_constructor([], visibility='public')
   4.470 +    cls.add_constructor([])
   4.471      ## attribute.h: bool ns3::AttributeChecker::Check(ns3::AttributeValue const & value) const [member function]
   4.472 -    cls.add_method('Check', 'bool', [param('ns3::AttributeValue&', 'value', is_const=True)], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.473 +    cls.add_method('Check', 
   4.474 +                   'bool', 
   4.475 +                   [param('ns3::AttributeValue&', 'value', is_const=True)], 
   4.476 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.477      ## attribute.h: std::string ns3::AttributeChecker::GetValueTypeName() const [member function]
   4.478 -    cls.add_method('GetValueTypeName', 'std::string', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.479 +    cls.add_method('GetValueTypeName', 
   4.480 +                   'std::string', 
   4.481 +                   [], 
   4.482 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.483      ## attribute.h: bool ns3::AttributeChecker::HasUnderlyingTypeInformation() const [member function]
   4.484 -    cls.add_method('HasUnderlyingTypeInformation', 'bool', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.485 +    cls.add_method('HasUnderlyingTypeInformation', 
   4.486 +                   'bool', 
   4.487 +                   [], 
   4.488 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.489      ## attribute.h: std::string ns3::AttributeChecker::GetUnderlyingTypeInformation() const [member function]
   4.490 -    cls.add_method('GetUnderlyingTypeInformation', 'std::string', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.491 +    cls.add_method('GetUnderlyingTypeInformation', 
   4.492 +                   'std::string', 
   4.493 +                   [], 
   4.494 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.495      ## attribute.h: ns3::Ptr<ns3::AttributeValue> ns3::AttributeChecker::Create() const [member function]
   4.496 -    cls.add_method('Create', 'ns3::Ptr< ns3::AttributeValue >', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.497 +    cls.add_method('Create', 
   4.498 +                   'ns3::Ptr< ns3::AttributeValue >', 
   4.499 +                   [], 
   4.500 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.501      ## attribute.h: bool ns3::AttributeChecker::Copy(ns3::AttributeValue const & source, ns3::AttributeValue & destination) const [member function]
   4.502 -    cls.add_method('Copy', 'bool', [param('ns3::AttributeValue&', 'source', is_const=True), param('ns3::AttributeValue&', 'destination')], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.503 +    cls.add_method('Copy', 
   4.504 +                   'bool', 
   4.505 +                   [param('ns3::AttributeValue&', 'source', is_const=True), param('ns3::AttributeValue&', 'destination')], 
   4.506 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.507      return
   4.508  
   4.509  def register_Ns3RandomVariableChecker_methods(root_module, cls):
   4.510 @@ -506,120 +691,195 @@
   4.511  
   4.512  def register_Ns3SystemMutex_methods(root_module, cls):
   4.513      ## system-mutex.h: ns3::SystemMutex::SystemMutex() [constructor]
   4.514 -    cls.add_constructor([], visibility='public')
   4.515 +    cls.add_constructor([])
   4.516      ## system-mutex.h: void ns3::SystemMutex::Lock() [member function]
   4.517 -    cls.add_method('Lock', 'void', [])
   4.518 +    cls.add_method('Lock', 
   4.519 +                   'void', 
   4.520 +                   [])
   4.521      ## system-mutex.h: void ns3::SystemMutex::Unlock() [member function]
   4.522 -    cls.add_method('Unlock', 'void', [])
   4.523 +    cls.add_method('Unlock', 
   4.524 +                   'void', 
   4.525 +                   [])
   4.526      return
   4.527  
   4.528  def register_Ns3NormalVariable_methods(root_module, cls):
   4.529      ## random-variable.h: ns3::NormalVariable::NormalVariable() [constructor]
   4.530 -    cls.add_constructor([], visibility='public')
   4.531 +    cls.add_constructor([])
   4.532      ## random-variable.h: ns3::NormalVariable::NormalVariable(double m, double v) [constructor]
   4.533 -    cls.add_constructor([param('double', 'm'), param('double', 'v')], visibility='public')
   4.534 +    cls.add_constructor([param('double', 'm'), param('double', 'v')])
   4.535      ## random-variable.h: ns3::NormalVariable::NormalVariable(double m, double v, double b) [constructor]
   4.536 -    cls.add_constructor([param('double', 'm'), param('double', 'v'), param('double', 'b')], visibility='public')
   4.537 +    cls.add_constructor([param('double', 'm'), param('double', 'v'), param('double', 'b')])
   4.538      ## random-variable.h: static double ns3::NormalVariable::GetSingleValue(double m, double v) [member function]
   4.539 -    cls.add_method('GetSingleValue', 'double', [param('double', 'm'), param('double', 'v')], is_static=True)
   4.540 +    cls.add_method('GetSingleValue', 
   4.541 +                   'double', 
   4.542 +                   [param('double', 'm'), param('double', 'v')], 
   4.543 +                   is_static=True)
   4.544      ## random-variable.h: static double ns3::NormalVariable::GetSingleValue(double m, double v, double b) [member function]
   4.545 -    cls.add_method('GetSingleValue', 'double', [param('double', 'm'), param('double', 'v'), param('double', 'b')], is_static=True)
   4.546 +    cls.add_method('GetSingleValue', 
   4.547 +                   'double', 
   4.548 +                   [param('double', 'm'), param('double', 'v'), param('double', 'b')], 
   4.549 +                   is_static=True)
   4.550      return
   4.551  
   4.552  def register_Ns3ObjectFactory_methods(root_module, cls):
   4.553      ## object-factory.h: ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor]
   4.554 -    cls.add_constructor([param('ns3::ObjectFactory&', 'arg0', is_const=True)], visibility='public')
   4.555 +    cls.add_constructor([param('ns3::ObjectFactory&', 'arg0', is_const=True)])
   4.556      ## object-factory.h: ns3::ObjectFactory::ObjectFactory() [constructor]
   4.557 -    cls.add_constructor([], visibility='public')
   4.558 +    cls.add_constructor([])
   4.559      ## object-factory.h: ns3::Ptr<ns3::Object> ns3::ObjectFactory::Create() const [member function]
   4.560 -    cls.add_method('Create', 'ns3::Ptr< ns3::Object >', [], is_const=True)
   4.561 +    cls.add_method('Create', 
   4.562 +                   'ns3::Ptr< ns3::Object >', 
   4.563 +                   [], 
   4.564 +                   is_const=True)
   4.565      ## object-factory.h: ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function]
   4.566 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_const=True)
   4.567 +    cls.add_method('GetTypeId', 
   4.568 +                   'ns3::TypeId', 
   4.569 +                   [], 
   4.570 +                   is_const=True)
   4.571      ## object-factory.h: void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function]
   4.572 -    cls.add_method('Set', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   4.573 +    cls.add_method('Set', 
   4.574 +                   'void', 
   4.575 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   4.576      ## object-factory.h: void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function]
   4.577 -    cls.add_method('SetTypeId', 'void', [param('ns3::TypeId', 'tid')])
   4.578 +    cls.add_method('SetTypeId', 
   4.579 +                   'void', 
   4.580 +                   [param('ns3::TypeId', 'tid')])
   4.581      ## object-factory.h: void ns3::ObjectFactory::SetTypeId(char const * tid) [member function]
   4.582 -    cls.add_method('SetTypeId', 'void', [param('char *', 'tid', transfer_ownership=False, is_const=True)])
   4.583 +    cls.add_method('SetTypeId', 
   4.584 +                   'void', 
   4.585 +                   [param('char *', 'tid', transfer_ownership=False, is_const=True)])
   4.586      ## object-factory.h: void ns3::ObjectFactory::SetTypeId(std::string tid) [member function]
   4.587 -    cls.add_method('SetTypeId', 'void', [param('std::string', 'tid')])
   4.588 +    cls.add_method('SetTypeId', 
   4.589 +                   'void', 
   4.590 +                   [param('std::string', 'tid')])
   4.591      cls.add_output_stream_operator()
   4.592      return
   4.593  
   4.594  def register_Ns3AttributeAccessor_methods(root_module, cls):
   4.595      ## attribute.h: ns3::AttributeAccessor::AttributeAccessor() [constructor]
   4.596 -    cls.add_constructor([], visibility='public')
   4.597 +    cls.add_constructor([])
   4.598      ## attribute.h: bool ns3::AttributeAccessor::Set(ns3::ObjectBase * object, ns3::AttributeValue const & value) const [member function]
   4.599 -    cls.add_method('Set', 'bool', [param('ns3::ObjectBase *', 'object', transfer_ownership=False), param('ns3::AttributeValue&', 'value', is_const=True)], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.600 +    cls.add_method('Set', 
   4.601 +                   'bool', 
   4.602 +                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False), param('ns3::AttributeValue&', 'value', is_const=True)], 
   4.603 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.604      ## attribute.h: bool ns3::AttributeAccessor::Get(ns3::ObjectBase const * object, ns3::AttributeValue & attribute) const [member function]
   4.605 -    cls.add_method('Get', 'bool', [param('ns3::ObjectBase *', 'object', transfer_ownership=False, is_const=True), param('ns3::AttributeValue&', 'attribute')], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.606 +    cls.add_method('Get', 
   4.607 +                   'bool', 
   4.608 +                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False, is_const=True), param('ns3::AttributeValue&', 'attribute')], 
   4.609 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.610      ## attribute.h: bool ns3::AttributeAccessor::HasGetter() const [member function]
   4.611 -    cls.add_method('HasGetter', 'bool', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.612 +    cls.add_method('HasGetter', 
   4.613 +                   'bool', 
   4.614 +                   [], 
   4.615 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.616      ## attribute.h: bool ns3::AttributeAccessor::HasSetter() const [member function]
   4.617 -    cls.add_method('HasSetter', 'bool', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.618 +    cls.add_method('HasSetter', 
   4.619 +                   'bool', 
   4.620 +                   [], 
   4.621 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.622      return
   4.623  
   4.624  def register_Ns3ParetoVariable_methods(root_module, cls):
   4.625      ## random-variable.h: ns3::ParetoVariable::ParetoVariable() [constructor]
   4.626 -    cls.add_constructor([], visibility='public')
   4.627 +    cls.add_constructor([])
   4.628      ## random-variable.h: ns3::ParetoVariable::ParetoVariable(double m) [constructor]
   4.629 -    cls.add_constructor([param('double', 'm')], visibility='public')
   4.630 +    cls.add_constructor([param('double', 'm')])
   4.631      ## random-variable.h: ns3::ParetoVariable::ParetoVariable(double m, double s) [constructor]
   4.632 -    cls.add_constructor([param('double', 'm'), param('double', 's')], visibility='public')
   4.633 +    cls.add_constructor([param('double', 'm'), param('double', 's')])
   4.634      ## random-variable.h: ns3::ParetoVariable::ParetoVariable(double m, double s, double b) [constructor]
   4.635 -    cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')], visibility='public')
   4.636 +    cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')])
   4.637      ## random-variable.h: static double ns3::ParetoVariable::GetSingleValue(double m, double s, double b=0) [member function]
   4.638 -    cls.add_method('GetSingleValue', 'double', [param('double', 'm'), param('double', 's'), param('double', 'b', default_value='0')], is_static=True)
   4.639 +    cls.add_method('GetSingleValue', 
   4.640 +                   'double', 
   4.641 +                   [param('double', 'm'), param('double', 's'), param('double', 'b', default_value='0')], 
   4.642 +                   is_static=True)
   4.643      return
   4.644  
   4.645  def register_Ns3ConstantVariable_methods(root_module, cls):
   4.646      ## random-variable.h: ns3::ConstantVariable::ConstantVariable() [constructor]
   4.647 -    cls.add_constructor([], visibility='public')
   4.648 +    cls.add_constructor([])
   4.649      ## random-variable.h: ns3::ConstantVariable::ConstantVariable(double c) [constructor]
   4.650 -    cls.add_constructor([param('double', 'c')], visibility='public')
   4.651 +    cls.add_constructor([param('double', 'c')])
   4.652      ## random-variable.h: void ns3::ConstantVariable::SetConstant(double c) [member function]
   4.653 -    cls.add_method('SetConstant', 'void', [param('double', 'c')])
   4.654 +    cls.add_method('SetConstant', 
   4.655 +                   'void', 
   4.656 +                   [param('double', 'c')])
   4.657      return
   4.658  
   4.659  def register_Ns3SystemThread_methods(root_module, cls):
   4.660      ## system-thread.h: ns3::SystemThread::SystemThread(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [constructor]
   4.661 -    cls.add_constructor([param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], visibility='public')
   4.662 +    cls.add_constructor([param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
   4.663      ## system-thread.h: void ns3::SystemThread::Ref() const [member function]
   4.664 -    cls.add_method('Ref', 'void', [], is_const=True)
   4.665 +    cls.add_method('Ref', 
   4.666 +                   'void', 
   4.667 +                   [], 
   4.668 +                   is_const=True)
   4.669      ## system-thread.h: void ns3::SystemThread::Unref() const [member function]
   4.670 -    cls.add_method('Unref', 'void', [], is_const=True)
   4.671 +    cls.add_method('Unref', 
   4.672 +                   'void', 
   4.673 +                   [], 
   4.674 +                   is_const=True)
   4.675      ## system-thread.h: void ns3::SystemThread::Start() [member function]
   4.676 -    cls.add_method('Start', 'void', [])
   4.677 +    cls.add_method('Start', 
   4.678 +                   'void', 
   4.679 +                   [])
   4.680      ## system-thread.h: void ns3::SystemThread::Join() [member function]
   4.681 -    cls.add_method('Join', 'void', [])
   4.682 +    cls.add_method('Join', 
   4.683 +                   'void', 
   4.684 +                   [])
   4.685      return
   4.686  
   4.687  def register_Ns3EmpiricalVariable_methods(root_module, cls):
   4.688      ## random-variable.h: ns3::EmpiricalVariable::EmpiricalVariable() [constructor]
   4.689 -    cls.add_constructor([], visibility='public')
   4.690 +    cls.add_constructor([])
   4.691      ## random-variable.h: void ns3::EmpiricalVariable::CDF(double v, double c) [member function]
   4.692 -    cls.add_method('CDF', 'void', [param('double', 'v'), param('double', 'c')])
   4.693 +    cls.add_method('CDF', 
   4.694 +                   'void', 
   4.695 +                   [param('double', 'v'), param('double', 'c')])
   4.696      return
   4.697  
   4.698  def register_Ns3EnumChecker_methods(root_module, cls):
   4.699      ## enum.h: ns3::EnumChecker::EnumChecker() [constructor]
   4.700 -    cls.add_constructor([], visibility='public')
   4.701 +    cls.add_constructor([])
   4.702      ## enum.h: void ns3::EnumChecker::AddDefault(int v, std::string name) [member function]
   4.703 -    cls.add_method('AddDefault', 'void', [param('int', 'v'), param('std::string', 'name')])
   4.704 +    cls.add_method('AddDefault', 
   4.705 +                   'void', 
   4.706 +                   [param('int', 'v'), param('std::string', 'name')])
   4.707      ## enum.h: void ns3::EnumChecker::Add(int v, std::string name) [member function]
   4.708 -    cls.add_method('Add', 'void', [param('int', 'v'), param('std::string', 'name')])
   4.709 +    cls.add_method('Add', 
   4.710 +                   'void', 
   4.711 +                   [param('int', 'v'), param('std::string', 'name')])
   4.712      ## enum.h: bool ns3::EnumChecker::Check(ns3::AttributeValue const & value) const [member function]
   4.713 -    cls.add_method('Check', 'bool', [param('ns3::AttributeValue&', 'value', is_const=True)], is_const=True, is_virtual=True)
   4.714 +    cls.add_method('Check', 
   4.715 +                   'bool', 
   4.716 +                   [param('ns3::AttributeValue&', 'value', is_const=True)], 
   4.717 +                   is_const=True, is_virtual=True)
   4.718      ## enum.h: std::string ns3::EnumChecker::GetValueTypeName() const [member function]
   4.719 -    cls.add_method('GetValueTypeName', 'std::string', [], is_const=True, is_virtual=True)
   4.720 +    cls.add_method('GetValueTypeName', 
   4.721 +                   'std::string', 
   4.722 +                   [], 
   4.723 +                   is_const=True, is_virtual=True)
   4.724      ## enum.h: bool ns3::EnumChecker::HasUnderlyingTypeInformation() const [member function]
   4.725 -    cls.add_method('HasUnderlyingTypeInformation', 'bool', [], is_const=True, is_virtual=True)
   4.726 +    cls.add_method('HasUnderlyingTypeInformation', 
   4.727 +                   'bool', 
   4.728 +                   [], 
   4.729 +                   is_const=True, is_virtual=True)
   4.730      ## enum.h: std::string ns3::EnumChecker::GetUnderlyingTypeInformation() const [member function]
   4.731 -    cls.add_method('GetUnderlyingTypeInformation', 'std::string', [], is_const=True, is_virtual=True)
   4.732 +    cls.add_method('GetUnderlyingTypeInformation', 
   4.733 +                   'std::string', 
   4.734 +                   [], 
   4.735 +                   is_const=True, is_virtual=True)
   4.736      ## enum.h: ns3::Ptr<ns3::AttributeValue> ns3::EnumChecker::Create() const [member function]
   4.737 -    cls.add_method('Create', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
   4.738 +    cls.add_method('Create', 
   4.739 +                   'ns3::Ptr< ns3::AttributeValue >', 
   4.740 +                   [], 
   4.741 +                   is_const=True, is_virtual=True)
   4.742      ## enum.h: bool ns3::EnumChecker::Copy(ns3::AttributeValue const & src, ns3::AttributeValue & dst) const [member function]
   4.743 -    cls.add_method('Copy', 'bool', [param('ns3::AttributeValue&', 'src', is_const=True), param('ns3::AttributeValue&', 'dst')], is_const=True, is_virtual=True)
   4.744 +    cls.add_method('Copy', 
   4.745 +                   'bool', 
   4.746 +                   [param('ns3::AttributeValue&', 'src', is_const=True), param('ns3::AttributeValue&', 'dst')], 
   4.747 +                   is_const=True, is_virtual=True)
   4.748      return
   4.749  
   4.750  def register_Ns3Empty_methods(root_module, cls):
   4.751 @@ -628,33 +888,63 @@
   4.752  
   4.753  def register_Ns3ObjectBase_methods(root_module, cls):
   4.754      ## object-base.h: ns3::ObjectBase::ObjectBase() [constructor]
   4.755 -    cls.add_constructor([], visibility='public')
   4.756 +    cls.add_constructor([])
   4.757      ## object-base.h: ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor]
   4.758 -    cls.add_constructor([param('ns3::ObjectBase&', 'arg0', is_const=True)], visibility='public')
   4.759 +    cls.add_constructor([param('ns3::ObjectBase&', 'arg0', is_const=True)])
   4.760      ## object-base.h: static ns3::TypeId ns3::ObjectBase::GetTypeId() [member function]
   4.761 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   4.762 +    cls.add_method('GetTypeId', 
   4.763 +                   'ns3::TypeId', 
   4.764 +                   [], 
   4.765 +                   is_static=True)
   4.766      ## object-base.h: ns3::TypeId ns3::ObjectBase::GetInstanceTypeId() const [member function]
   4.767 -    cls.add_method('GetInstanceTypeId', 'ns3::TypeId', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.768 +    cls.add_method('GetInstanceTypeId', 
   4.769 +                   'ns3::TypeId', 
   4.770 +                   [], 
   4.771 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.772      ## object-base.h: void ns3::ObjectBase::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
   4.773 -    cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   4.774 +    cls.add_method('SetAttribute', 
   4.775 +                   'void', 
   4.776 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   4.777      ## object-base.h: bool ns3::ObjectBase::SetAttributeFailSafe(std::string name, ns3::AttributeValue const & value) [member function]
   4.778 -    cls.add_method('SetAttributeFailSafe', 'bool', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   4.779 +    cls.add_method('SetAttributeFailSafe', 
   4.780 +                   'bool', 
   4.781 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   4.782      ## object-base.h: void ns3::ObjectBase::GetAttribute(std::string name, ns3::AttributeValue & value) const [member function]
   4.783 -    cls.add_method('GetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value')], is_const=True)
   4.784 +    cls.add_method('GetAttribute', 
   4.785 +                   'void', 
   4.786 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value')], 
   4.787 +                   is_const=True)
   4.788      ## object-base.h: bool ns3::ObjectBase::GetAttributeFailSafe(std::string name, ns3::AttributeValue & attribute) const [member function]
   4.789 -    cls.add_method('GetAttributeFailSafe', 'bool', [param('std::string', 'name'), param('ns3::AttributeValue&', 'attribute')], is_const=True)
   4.790 +    cls.add_method('GetAttributeFailSafe', 
   4.791 +                   'bool', 
   4.792 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'attribute')], 
   4.793 +                   is_const=True)
   4.794      ## object-base.h: bool ns3::ObjectBase::TraceConnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
   4.795 -    cls.add_method('TraceConnect', 'bool', [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase&', 'cb', is_const=True)])
   4.796 +    cls.add_method('TraceConnect', 
   4.797 +                   'bool', 
   4.798 +                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase&', 'cb', is_const=True)])
   4.799      ## object-base.h: bool ns3::ObjectBase::TraceConnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
   4.800 -    cls.add_method('TraceConnectWithoutContext', 'bool', [param('std::string', 'name'), param('ns3::CallbackBase&', 'cb', is_const=True)])
   4.801 +    cls.add_method('TraceConnectWithoutContext', 
   4.802 +                   'bool', 
   4.803 +                   [param('std::string', 'name'), param('ns3::CallbackBase&', 'cb', is_const=True)])
   4.804      ## object-base.h: bool ns3::ObjectBase::TraceDisconnect(std::string name, std::string context, ns3::CallbackBase const & cb) [member function]
   4.805 -    cls.add_method('TraceDisconnect', 'bool', [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase&', 'cb', is_const=True)])
   4.806 +    cls.add_method('TraceDisconnect', 
   4.807 +                   'bool', 
   4.808 +                   [param('std::string', 'name'), param('std::string', 'context'), param('ns3::CallbackBase&', 'cb', is_const=True)])
   4.809      ## object-base.h: bool ns3::ObjectBase::TraceDisconnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function]
   4.810 -    cls.add_method('TraceDisconnectWithoutContext', 'bool', [param('std::string', 'name'), param('ns3::CallbackBase&', 'cb', is_const=True)])
   4.811 +    cls.add_method('TraceDisconnectWithoutContext', 
   4.812 +                   'bool', 
   4.813 +                   [param('std::string', 'name'), param('ns3::CallbackBase&', 'cb', is_const=True)])
   4.814      ## object-base.h: void ns3::ObjectBase::NotifyConstructionCompleted() [member function]
   4.815 -    cls.add_method('NotifyConstructionCompleted', 'void', [], visibility='protected', is_virtual=True)
   4.816 +    cls.add_method('NotifyConstructionCompleted', 
   4.817 +                   'void', 
   4.818 +                   [], 
   4.819 +                   visibility='protected', is_virtual=True)
   4.820      ## object-base.h: void ns3::ObjectBase::ConstructSelf(ns3::AttributeList const & attributes) [member function]
   4.821 -    cls.add_method('ConstructSelf', 'void', [param('ns3::AttributeList&', 'attributes', is_const=True)], visibility='protected')
   4.822 +    cls.add_method('ConstructSelf', 
   4.823 +                   'void', 
   4.824 +                   [param('ns3::AttributeList&', 'attributes', is_const=True)], 
   4.825 +                   visibility='protected')
   4.826      return
   4.827  
   4.828  def register_Ns3CommandLine_methods(root_module, cls):
   4.829 @@ -691,325 +981,520 @@
   4.830  
   4.831  def register_Ns3RngStream_methods(root_module, cls):
   4.832      ## rng-stream.h: ns3::RngStream::RngStream() [constructor]
   4.833 -    cls.add_constructor([], visibility='public')
   4.834 +    cls.add_constructor([])
   4.835      ## rng-stream.h: ns3::RngStream::RngStream(ns3::RngStream const & arg0) [copy constructor]
   4.836 -    cls.add_constructor([param('ns3::RngStream&', 'arg0', is_const=True)], visibility='public')
   4.837 +    cls.add_constructor([param('ns3::RngStream&', 'arg0', is_const=True)])
   4.838      ## rng-stream.h: void ns3::RngStream::InitializeStream() [member function]
   4.839 -    cls.add_method('InitializeStream', 'void', [])
   4.840 +    cls.add_method('InitializeStream', 
   4.841 +                   'void', 
   4.842 +                   [])
   4.843      ## rng-stream.h: void ns3::RngStream::ResetStartStream() [member function]
   4.844 -    cls.add_method('ResetStartStream', 'void', [])
   4.845 +    cls.add_method('ResetStartStream', 
   4.846 +                   'void', 
   4.847 +                   [])
   4.848      ## rng-stream.h: void ns3::RngStream::ResetStartSubstream() [member function]
   4.849 -    cls.add_method('ResetStartSubstream', 'void', [])
   4.850 +    cls.add_method('ResetStartSubstream', 
   4.851 +                   'void', 
   4.852 +                   [])
   4.853      ## rng-stream.h: void ns3::RngStream::ResetNextSubstream() [member function]
   4.854 -    cls.add_method('ResetNextSubstream', 'void', [])
   4.855 +    cls.add_method('ResetNextSubstream', 
   4.856 +                   'void', 
   4.857 +                   [])
   4.858      ## rng-stream.h: void ns3::RngStream::ResetNthSubstream(uint32_t N) [member function]
   4.859 -    cls.add_method('ResetNthSubstream', 'void', [param('uint32_t', 'N')])
   4.860 +    cls.add_method('ResetNthSubstream', 
   4.861 +                   'void', 
   4.862 +                   [param('uint32_t', 'N')])
   4.863      ## rng-stream.h: void ns3::RngStream::SetAntithetic(bool a) [member function]
   4.864 -    cls.add_method('SetAntithetic', 'void', [param('bool', 'a')])
   4.865 +    cls.add_method('SetAntithetic', 
   4.866 +                   'void', 
   4.867 +                   [param('bool', 'a')])
   4.868      ## rng-stream.h: void ns3::RngStream::IncreasedPrecis(bool incp) [member function]
   4.869 -    cls.add_method('IncreasedPrecis', 'void', [param('bool', 'incp')])
   4.870 +    cls.add_method('IncreasedPrecis', 
   4.871 +                   'void', 
   4.872 +                   [param('bool', 'incp')])
   4.873      ## rng-stream.h: bool ns3::RngStream::SetSeeds(uint32_t const * seed) [member function]
   4.874 -    cls.add_method('SetSeeds', 'bool', [param('uint32_t *', 'seed', transfer_ownership=False, is_const=True)])
   4.875 +    cls.add_method('SetSeeds', 
   4.876 +                   'bool', 
   4.877 +                   [param('uint32_t *', 'seed', transfer_ownership=False, is_const=True)])
   4.878      ## rng-stream.h: void ns3::RngStream::AdvanceState(int32_t e, int32_t c) [member function]
   4.879 -    cls.add_method('AdvanceState', 'void', [param('int32_t', 'e'), param('int32_t', 'c')])
   4.880 +    cls.add_method('AdvanceState', 
   4.881 +                   'void', 
   4.882 +                   [param('int32_t', 'e'), param('int32_t', 'c')])
   4.883      ## rng-stream.h: void ns3::RngStream::GetState(uint32_t * seed) const [member function]
   4.884 -    cls.add_method('GetState', 'void', [param('uint32_t *', 'seed')], is_const=True)
   4.885 +    cls.add_method('GetState', 
   4.886 +                   'void', 
   4.887 +                   [param('uint32_t *', 'seed')], 
   4.888 +                   is_const=True)
   4.889      ## rng-stream.h: double ns3::RngStream::RandU01() [member function]
   4.890 -    cls.add_method('RandU01', 'double', [])
   4.891 +    cls.add_method('RandU01', 
   4.892 +                   'double', 
   4.893 +                   [])
   4.894      ## rng-stream.h: int32_t ns3::RngStream::RandInt(int32_t i, int32_t j) [member function]
   4.895 -    cls.add_method('RandInt', 'int32_t', [param('int32_t', 'i'), param('int32_t', 'j')])
   4.896 +    cls.add_method('RandInt', 
   4.897 +                   'int32_t', 
   4.898 +                   [param('int32_t', 'i'), param('int32_t', 'j')])
   4.899      ## rng-stream.h: static bool ns3::RngStream::SetPackageSeed(uint32_t const * seed) [member function]
   4.900 -    cls.add_method('SetPackageSeed', 'bool', [param('uint32_t *', 'seed', transfer_ownership=False, is_const=True)], is_static=True)
   4.901 +    cls.add_method('SetPackageSeed', 
   4.902 +                   'bool', 
   4.903 +                   [param('uint32_t *', 'seed', transfer_ownership=False, is_const=True)], 
   4.904 +                   is_static=True)
   4.905      ## rng-stream.h: static bool ns3::RngStream::CheckSeed(uint32_t const * seed) [member function]
   4.906 -    cls.add_method('CheckSeed', 'bool', [param('uint32_t *', 'seed', transfer_ownership=False, is_const=True)], is_static=True)
   4.907 +    cls.add_method('CheckSeed', 
   4.908 +                   'bool', 
   4.909 +                   [param('uint32_t *', 'seed', transfer_ownership=False, is_const=True)], 
   4.910 +                   is_static=True)
   4.911      return
   4.912  
   4.913  def register_Ns3LogNormalVariable_methods(root_module, cls):
   4.914      ## random-variable.h: ns3::LogNormalVariable::LogNormalVariable(double mu, double sigma) [constructor]
   4.915 -    cls.add_constructor([param('double', 'mu'), param('double', 'sigma')], visibility='public')
   4.916 +    cls.add_constructor([param('double', 'mu'), param('double', 'sigma')])
   4.917      ## random-variable.h: static double ns3::LogNormalVariable::GetSingleValue(double mu, double sigma) [member function]
   4.918 -    cls.add_method('GetSingleValue', 'double', [param('double', 'mu'), param('double', 'sigma')], is_static=True)
   4.919 +    cls.add_method('GetSingleValue', 
   4.920 +                   'double', 
   4.921 +                   [param('double', 'mu'), param('double', 'sigma')], 
   4.922 +                   is_static=True)
   4.923      return
   4.924  
   4.925  def register_Ns3IntEmpiricalVariable_methods(root_module, cls):
   4.926      ## random-variable.h: ns3::IntEmpiricalVariable::IntEmpiricalVariable() [constructor]
   4.927 -    cls.add_constructor([], visibility='public')
   4.928 +    cls.add_constructor([])
   4.929      return
   4.930  
   4.931  def register_Ns3PointerChecker_methods(root_module, cls):
   4.932      ## pointer.h: ns3::TypeId ns3::PointerChecker::GetPointeeTypeId() const [member function]
   4.933 -    cls.add_method('GetPointeeTypeId', 'ns3::TypeId', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   4.934 +    cls.add_method('GetPointeeTypeId', 
   4.935 +                   'ns3::TypeId', 
   4.936 +                   [], 
   4.937 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   4.938      cls.add_constructor([])
   4.939      return
   4.940  
   4.941  def register_Ns3WeibullVariable_methods(root_module, cls):
   4.942      ## random-variable.h: ns3::WeibullVariable::WeibullVariable() [constructor]
   4.943 -    cls.add_constructor([], visibility='public')
   4.944 +    cls.add_constructor([])
   4.945      ## random-variable.h: ns3::WeibullVariable::WeibullVariable(double m) [constructor]
   4.946 -    cls.add_constructor([param('double', 'm')], visibility='public')
   4.947 +    cls.add_constructor([param('double', 'm')])
   4.948      ## random-variable.h: ns3::WeibullVariable::WeibullVariable(double m, double s) [constructor]
   4.949 -    cls.add_constructor([param('double', 'm'), param('double', 's')], visibility='public')
   4.950 +    cls.add_constructor([param('double', 'm'), param('double', 's')])
   4.951      ## random-variable.h: ns3::WeibullVariable::WeibullVariable(double m, double s, double b) [constructor]
   4.952 -    cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')], visibility='public')
   4.953 +    cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')])
   4.954      ## random-variable.h: static double ns3::WeibullVariable::GetSingleValue(double m, double s, double b=0) [member function]
   4.955 -    cls.add_method('GetSingleValue', 'double', [param('double', 'm'), param('double', 's'), param('double', 'b', default_value='0')], is_static=True)
   4.956 +    cls.add_method('GetSingleValue', 
   4.957 +                   'double', 
   4.958 +                   [param('double', 'm'), param('double', 's'), param('double', 'b', default_value='0')], 
   4.959 +                   is_static=True)
   4.960      return
   4.961  
   4.962  def register_Ns3CallbackBase_methods(root_module, cls):
   4.963      ## callback.h: ns3::CallbackBase::CallbackBase() [constructor]
   4.964 -    cls.add_constructor([], visibility='public')
   4.965 +    cls.add_constructor([])
   4.966      ## callback.h: ns3::Ptr<ns3::CallbackImplBase> ns3::CallbackBase::GetImpl() const [member function]
   4.967 -    cls.add_method('GetImpl', 'ns3::Ptr< ns3::CallbackImplBase >', [], is_const=True)
   4.968 +    cls.add_method('GetImpl', 
   4.969 +                   'ns3::Ptr< ns3::CallbackImplBase >', 
   4.970 +                   [], 
   4.971 +                   is_const=True)
   4.972      ## callback.h: ns3::CallbackBase::CallbackBase(ns3::Ptr<ns3::CallbackImplBase> impl) [constructor]
   4.973 -    cls.add_constructor([param('ns3::Ptr< ns3::CallbackImplBase >', 'impl')], visibility='protected')
   4.974 +    cls.add_constructor([param('ns3::Ptr< ns3::CallbackImplBase >', 'impl')], 
   4.975 +                        visibility='protected')
   4.976      return
   4.977  
   4.978  def register_Ns3ExponentialVariable_methods(root_module, cls):
   4.979      ## random-variable.h: ns3::ExponentialVariable::ExponentialVariable() [constructor]
   4.980 -    cls.add_constructor([], visibility='public')
   4.981 +    cls.add_constructor([])
   4.982      ## random-variable.h: ns3::ExponentialVariable::ExponentialVariable(double m) [constructor]
   4.983 -    cls.add_constructor([param('double', 'm')], visibility='public')
   4.984 +    cls.add_constructor([param('double', 'm')])
   4.985      ## random-variable.h: ns3::ExponentialVariable::ExponentialVariable(double m, double b) [constructor]
   4.986 -    cls.add_constructor([param('double', 'm'), param('double', 'b')], visibility='public')
   4.987 +    cls.add_constructor([param('double', 'm'), param('double', 'b')])
   4.988      ## random-variable.h: static double ns3::ExponentialVariable::GetSingleValue(double m, double b=0) [member function]
   4.989 -    cls.add_method('GetSingleValue', 'double', [param('double', 'm'), param('double', 'b', default_value='0')], is_static=True)
   4.990 +    cls.add_method('GetSingleValue', 
   4.991 +                   'double', 
   4.992 +                   [param('double', 'm'), param('double', 'b', default_value='0')], 
   4.993 +                   is_static=True)
   4.994      return
   4.995  
   4.996  def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Mac48Address_Ns3Empty_Ns3Empty_methods(root_module, cls):
   4.997      ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::TracedCallback() [constructor]
   4.998 -    cls.add_constructor([], visibility='public')
   4.999 +    cls.add_constructor([])
  4.1000      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1001 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1002 +    cls.add_method('ConnectWithoutContext', 
  4.1003 +                   'void', 
  4.1004 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1005      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1006 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1007 +    cls.add_method('Connect', 
  4.1008 +                   'void', 
  4.1009 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1010      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1011 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1012 +    cls.add_method('DisconnectWithoutContext', 
  4.1013 +                   'void', 
  4.1014 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1015      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1016 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1017 +    cls.add_method('Disconnect', 
  4.1018 +                   'void', 
  4.1019 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1020      return
  4.1021  
  4.1022  def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, cls):
  4.1023      ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::TracedCallback() [constructor]
  4.1024 -    cls.add_constructor([], visibility='public')
  4.1025 +    cls.add_constructor([])
  4.1026      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1027 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1028 +    cls.add_method('ConnectWithoutContext', 
  4.1029 +                   'void', 
  4.1030 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1031      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1032 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1033 +    cls.add_method('Connect', 
  4.1034 +                   'void', 
  4.1035 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1036      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1037 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1038 +    cls.add_method('DisconnectWithoutContext', 
  4.1039 +                   'void', 
  4.1040 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1041      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1042 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1043 +    cls.add_method('Disconnect', 
  4.1044 +                   'void', 
  4.1045 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1046      return
  4.1047  
  4.1048  def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Address_const__amp___Ns3Empty_Ns3Empty_methods(root_module, cls):
  4.1049      ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::TracedCallback() [constructor]
  4.1050 -    cls.add_constructor([], visibility='public')
  4.1051 +    cls.add_constructor([])
  4.1052      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1053 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1054 +    cls.add_method('ConnectWithoutContext', 
  4.1055 +                   'void', 
  4.1056 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1057      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1058 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1059 +    cls.add_method('Connect', 
  4.1060 +                   'void', 
  4.1061 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1062      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1063 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1064 +    cls.add_method('DisconnectWithoutContext', 
  4.1065 +                   'void', 
  4.1066 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1067      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1068 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1069 +    cls.add_method('Disconnect', 
  4.1070 +                   'void', 
  4.1071 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1072      return
  4.1073  
  4.1074  def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, cls):
  4.1075      ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::TracedCallback() [constructor]
  4.1076 -    cls.add_constructor([], visibility='public')
  4.1077 +    cls.add_constructor([])
  4.1078      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1079 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1080 +    cls.add_method('ConnectWithoutContext', 
  4.1081 +                   'void', 
  4.1082 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1083      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1084 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1085 +    cls.add_method('Connect', 
  4.1086 +                   'void', 
  4.1087 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1088      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1089 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1090 +    cls.add_method('DisconnectWithoutContext', 
  4.1091 +                   'void', 
  4.1092 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1093      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1094 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1095 +    cls.add_method('Disconnect', 
  4.1096 +                   'void', 
  4.1097 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1098      return
  4.1099  
  4.1100  def register_Ns3TracedCallback__Ns3Ptr__lt__ns3MobilityModel_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, cls):
  4.1101      ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::TracedCallback() [constructor]
  4.1102 -    cls.add_constructor([], visibility='public')
  4.1103 +    cls.add_constructor([])
  4.1104      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1105 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1106 +    cls.add_method('ConnectWithoutContext', 
  4.1107 +                   'void', 
  4.1108 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1109      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1110 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1111 +    cls.add_method('Connect', 
  4.1112 +                   'void', 
  4.1113 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1114      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1115 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1116 +    cls.add_method('DisconnectWithoutContext', 
  4.1117 +                   'void', 
  4.1118 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1119      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1120 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1121 +    cls.add_method('Disconnect', 
  4.1122 +                   'void', 
  4.1123 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1124      return
  4.1125  
  4.1126  def register_Ns3TracedCallback__Ns3TimeUnit__lt__1__gt___Ns3TimeUnit__lt__1__gt___Ns3WifiPhyState_Ns3Empty_methods(root_module, cls):
  4.1127      ## traced-callback.h: ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::TracedCallback() [constructor]
  4.1128 -    cls.add_constructor([], visibility='public')
  4.1129 +    cls.add_constructor([])
  4.1130      ## traced-callback.h: void ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1131 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1132 +    cls.add_method('ConnectWithoutContext', 
  4.1133 +                   'void', 
  4.1134 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1135      ## traced-callback.h: void ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1136 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1137 +    cls.add_method('Connect', 
  4.1138 +                   'void', 
  4.1139 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1140      ## traced-callback.h: void ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1141 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1142 +    cls.add_method('DisconnectWithoutContext', 
  4.1143 +                   'void', 
  4.1144 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1145      ## traced-callback.h: void ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1146 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1147 +    cls.add_method('Disconnect', 
  4.1148 +                   'void', 
  4.1149 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1150      return
  4.1151  
  4.1152  def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3WifiMode_Ns3WifiPreamble_Unsigned_char_methods(root_module, cls):
  4.1153      ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::TracedCallback() [constructor]
  4.1154 -    cls.add_constructor([], visibility='public')
  4.1155 +    cls.add_constructor([])
  4.1156      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1157 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1158 +    cls.add_method('ConnectWithoutContext', 
  4.1159 +                   'void', 
  4.1160 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1161      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1162 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1163 +    cls.add_method('Connect', 
  4.1164 +                   'void', 
  4.1165 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1166      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1167 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1168 +    cls.add_method('DisconnectWithoutContext', 
  4.1169 +                   'void', 
  4.1170 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1171      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1172 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1173 +    cls.add_method('Disconnect', 
  4.1174 +                   'void', 
  4.1175 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1176      return
  4.1177  
  4.1178  def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3Empty_Ns3Empty_methods(root_module, cls):
  4.1179      ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::TracedCallback() [constructor]
  4.1180 -    cls.add_constructor([], visibility='public')
  4.1181 +    cls.add_constructor([])
  4.1182      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1183 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1184 +    cls.add_method('ConnectWithoutContext', 
  4.1185 +                   'void', 
  4.1186 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1187      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1188 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1189 +    cls.add_method('Connect', 
  4.1190 +                   'void', 
  4.1191 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1192      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1193 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1194 +    cls.add_method('DisconnectWithoutContext', 
  4.1195 +                   'void', 
  4.1196 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1197      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1198 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1199 +    cls.add_method('Disconnect', 
  4.1200 +                   'void', 
  4.1201 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1202      return
  4.1203  
  4.1204  def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3WifiMode_Ns3WifiPreamble_methods(root_module, cls):
  4.1205      ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::TracedCallback() [constructor]
  4.1206 -    cls.add_constructor([], visibility='public')
  4.1207 +    cls.add_constructor([])
  4.1208      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1209 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1210 +    cls.add_method('ConnectWithoutContext', 
  4.1211 +                   'void', 
  4.1212 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1213      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1214 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1215 +    cls.add_method('Connect', 
  4.1216 +                   'void', 
  4.1217 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1218      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1219 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1220 +    cls.add_method('DisconnectWithoutContext', 
  4.1221 +                   'void', 
  4.1222 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1223      ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1224 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1225 +    cls.add_method('Disconnect', 
  4.1226 +                   'void', 
  4.1227 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1228      return
  4.1229  
  4.1230  def register_Ns3TracedCallback__Unsigned_int_Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, cls):
  4.1231      ## traced-callback.h: ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::TracedCallback() [constructor]
  4.1232 -    cls.add_constructor([], visibility='public')
  4.1233 +    cls.add_constructor([])
  4.1234      ## traced-callback.h: void ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1235 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1236 +    cls.add_method('ConnectWithoutContext', 
  4.1237 +                   'void', 
  4.1238 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1239      ## traced-callback.h: void ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1240 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1241 +    cls.add_method('Connect', 
  4.1242 +                   'void', 
  4.1243 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1244      ## traced-callback.h: void ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
  4.1245 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1246 +    cls.add_method('DisconnectWithoutContext', 
  4.1247 +                   'void', 
  4.1248 +                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
  4.1249      ## traced-callback.h: void ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
  4.1250 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1251 +    cls.add_method('Disconnect', 
  4.1252 +                   'void', 
  4.1253 +                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
  4.1254      return
  4.1255  
  4.1256  def register_Ns3DeterministicVariable_methods(root_module, cls):
  4.1257      ## random-variable.h: ns3::DeterministicVariable::DeterministicVariable(double * d, uint32_t c) [constructor]
  4.1258 -    cls.add_constructor([param('double *', 'd'), param('uint32_t', 'c')], visibility='public')
  4.1259 +    cls.add_constructor([param('double *', 'd'), param('uint32_t', 'c')])
  4.1260      return
  4.1261  
  4.1262  def register_Ns3AttributeList_methods(root_module, cls):
  4.1263      ## attribute-list.h: ns3::AttributeList::AttributeList() [constructor]
  4.1264 -    cls.add_constructor([], visibility='public')
  4.1265 +    cls.add_constructor([])
  4.1266      ## attribute-list.h: ns3::AttributeList::AttributeList(ns3::AttributeList const & o) [copy constructor]
  4.1267 -    cls.add_constructor([param('ns3::AttributeList&', 'o', is_const=True)], visibility='public')
  4.1268 +    cls.add_constructor([param('ns3::AttributeList&', 'o', is_const=True)])
  4.1269      ## attribute-list.h: void ns3::AttributeList::Set(std::string name, ns3::AttributeValue const & value) [member function]
  4.1270 -    cls.add_method('Set', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.1271 +    cls.add_method('Set', 
  4.1272 +                   'void', 
  4.1273 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.1274      ## attribute-list.h: bool ns3::AttributeList::SetFailSafe(std::string name, ns3::AttributeValue const & value) [member function]
  4.1275 -    cls.add_method('SetFailSafe', 'bool', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.1276 +    cls.add_method('SetFailSafe', 
  4.1277 +                   'bool', 
  4.1278 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.1279      ## attribute-list.h: void ns3::AttributeList::SetWithTid(ns3::TypeId tid, std::string name, ns3::AttributeValue const & value) [member function]
  4.1280 -    cls.add_method('SetWithTid', 'void', [param('ns3::TypeId', 'tid'), param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.1281 +    cls.add_method('SetWithTid', 
  4.1282 +                   'void', 
  4.1283 +                   [param('ns3::TypeId', 'tid'), param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.1284      ## attribute-list.h: void ns3::AttributeList::Reset() [member function]
  4.1285 -    cls.add_method('Reset', 'void', [])
  4.1286 +    cls.add_method('Reset', 
  4.1287 +                   'void', 
  4.1288 +                   [])
  4.1289      ## attribute-list.h: static ns3::AttributeList * ns3::AttributeList::GetGlobal() [member function]
  4.1290 -    cls.add_method('GetGlobal', 'ns3::AttributeList *', [], is_static=True)
  4.1291 +    cls.add_method('GetGlobal', 
  4.1292 +                   'ns3::AttributeList *', 
  4.1293 +                   [], 
  4.1294 +                   is_static=True)
  4.1295      ## attribute-list.h: std::string ns3::AttributeList::SerializeToString() const [member function]
  4.1296 -    cls.add_method('SerializeToString', 'std::string', [], is_const=True)
  4.1297 +    cls.add_method('SerializeToString', 
  4.1298 +                   'std::string', 
  4.1299 +                   [], 
  4.1300 +                   is_const=True)
  4.1301      ## attribute-list.h: bool ns3::AttributeList::DeserializeFromString(std::string value) [member function]
  4.1302 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value')])
  4.1303 +    cls.add_method('DeserializeFromString', 
  4.1304 +                   'bool', 
  4.1305 +                   [param('std::string', 'value')])
  4.1306      return
  4.1307  
  4.1308  def register_Ns3AttributeValue_methods(root_module, cls):
  4.1309      ## attribute.h: ns3::AttributeValue::AttributeValue(ns3::AttributeValue const & arg0) [copy constructor]
  4.1310 -    cls.add_constructor([param('ns3::AttributeValue&', 'arg0', is_const=True)], visibility='public')
  4.1311 +    cls.add_constructor([param('ns3::AttributeValue&', 'arg0', is_const=True)])
  4.1312      ## attribute.h: ns3::AttributeValue::AttributeValue() [constructor]
  4.1313 -    cls.add_constructor([], visibility='public')
  4.1314 +    cls.add_constructor([])
  4.1315      ## attribute.h: ns3::Ptr<ns3::AttributeValue> ns3::AttributeValue::Copy() const [member function]
  4.1316 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_pure_virtual=True, is_const=True, is_virtual=True)
  4.1317 +    cls.add_method('Copy', 
  4.1318 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1319 +                   [], 
  4.1320 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  4.1321      ## attribute.h: std::string ns3::AttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1322 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_pure_virtual=True, is_const=True, is_virtual=True)
  4.1323 +    cls.add_method('SerializeToString', 
  4.1324 +                   'std::string', 
  4.1325 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1326 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  4.1327      ## attribute.h: bool ns3::AttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1328 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_pure_virtual=True, is_virtual=True)
  4.1329 +    cls.add_method('DeserializeFromString', 
  4.1330 +                   'bool', 
  4.1331 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1332 +                   is_pure_virtual=True, is_virtual=True)
  4.1333      return
  4.1334  
  4.1335  def register_Ns3UniformVariable_methods(root_module, cls):
  4.1336      ## random-variable.h: ns3::UniformVariable::UniformVariable() [constructor]
  4.1337 -    cls.add_constructor([], visibility='public')
  4.1338 +    cls.add_constructor([])
  4.1339      ## random-variable.h: ns3::UniformVariable::UniformVariable(double s, double l) [constructor]
  4.1340 -    cls.add_constructor([param('double', 's'), param('double', 'l')], visibility='public')
  4.1341 +    cls.add_constructor([param('double', 's'), param('double', 'l')])
  4.1342      ## random-variable.h: static double ns3::UniformVariable::GetSingleValue(double s, double l) [member function]
  4.1343 -    cls.add_method('GetSingleValue', 'double', [param('double', 's'), param('double', 'l')], is_static=True)
  4.1344 +    cls.add_method('GetSingleValue', 
  4.1345 +                   'double', 
  4.1346 +                   [param('double', 's'), param('double', 'l')], 
  4.1347 +                   is_static=True)
  4.1348      return
  4.1349  
  4.1350  def register_Ns3Object_methods(root_module, cls):
  4.1351      ## object.h: static ns3::TypeId ns3::Object::GetTypeId() [member function]
  4.1352 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
  4.1353 +    cls.add_method('GetTypeId', 
  4.1354 +                   'ns3::TypeId', 
  4.1355 +                   [], 
  4.1356 +                   is_static=True)
  4.1357      ## object.h: ns3::Object::Object() [constructor]
  4.1358 -    cls.add_constructor([], visibility='public')
  4.1359 +    cls.add_constructor([])
  4.1360      ## object.h: ns3::TypeId ns3::Object::GetInstanceTypeId() const [member function]
  4.1361 -    cls.add_method('GetInstanceTypeId', 'ns3::TypeId', [], is_const=True, is_virtual=True)
  4.1362 +    cls.add_method('GetInstanceTypeId', 
  4.1363 +                   'ns3::TypeId', 
  4.1364 +                   [], 
  4.1365 +                   is_const=True, is_virtual=True)
  4.1366      ## object.h: ns3::Ptr<ns3::Object> ns3::Object::GetObject(ns3::TypeId tid) const [member function]
  4.1367 -    cls.add_method('GetObject', 'ns3::Ptr< ns3::Object >', [param('ns3::TypeId', 'tid')], is_const=True, template_parameters=['ns3::Object'], custom_template_method_name='GetObject')
  4.1368 +    cls.add_method('GetObject', 
  4.1369 +                   'ns3::Ptr< ns3::Object >', 
  4.1370 +                   [param('ns3::TypeId', 'tid')], 
  4.1371 +                   is_const=True, template_parameters=['ns3::Object'], custom_template_method_name='GetObject')
  4.1372      ## object.h: void ns3::Object::Dispose() [member function]
  4.1373 -    cls.add_method('Dispose', 'void', [])
  4.1374 +    cls.add_method('Dispose', 
  4.1375 +                   'void', 
  4.1376 +                   [])
  4.1377      ## object.h: void ns3::Object::AggregateObject(ns3::Ptr<ns3::Object> other) [member function]
  4.1378 -    cls.add_method('AggregateObject', 'void', [param('ns3::Ptr< ns3::Object >', 'other')])
  4.1379 +    cls.add_method('AggregateObject', 
  4.1380 +                   'void', 
  4.1381 +                   [param('ns3::Ptr< ns3::Object >', 'other')])
  4.1382      ## object.h: ns3::Object::AggregateIterator ns3::Object::GetAggregateIterator() const [member function]
  4.1383 -    cls.add_method('GetAggregateIterator', 'ns3::Object::AggregateIterator', [], is_const=True)
  4.1384 +    cls.add_method('GetAggregateIterator', 
  4.1385 +                   'ns3::Object::AggregateIterator', 
  4.1386 +                   [], 
  4.1387 +                   is_const=True)
  4.1388      ## object.h: void ns3::Object::DoDispose() [member function]
  4.1389 -    cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True)
  4.1390 +    cls.add_method('DoDispose', 
  4.1391 +                   'void', 
  4.1392 +                   [], 
  4.1393 +                   visibility='protected', is_virtual=True)
  4.1394      ## object.h: ns3::Object::Object(ns3::Object const & o) [copy constructor]
  4.1395 -    cls.add_constructor([param('ns3::Object&', 'o', is_const=True)], visibility='protected')
  4.1396 +    cls.add_constructor([param('ns3::Object&', 'o', is_const=True)], 
  4.1397 +                        visibility='protected')
  4.1398      return
  4.1399  
  4.1400  def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
  4.1401      ## object.h: ns3::Object::AggregateIterator::AggregateIterator() [constructor]
  4.1402 -    cls.add_constructor([], visibility='public')
  4.1403 +    cls.add_constructor([])
  4.1404      ## object.h: bool ns3::Object::AggregateIterator::HasNext() const [member function]
  4.1405 -    cls.add_method('HasNext', 'bool', [], is_const=True)
  4.1406 +    cls.add_method('HasNext', 
  4.1407 +                   'bool', 
  4.1408 +                   [], 
  4.1409 +                   is_const=True)
  4.1410      ## object.h: ns3::Ptr<ns3::Object const> ns3::Object::AggregateIterator::Next() [member function]
  4.1411 -    cls.add_method('Next', 'ns3::Ptr< ns3::Object const >', [])
  4.1412 +    cls.add_method('Next', 
  4.1413 +                   'ns3::Ptr< ns3::Object const >', 
  4.1414 +                   [])
  4.1415      return
  4.1416  
  4.1417  def register_Ns3SystemCondition_methods(root_module, cls):
  4.1418      ## system-condition.h: ns3::SystemCondition::SystemCondition() [constructor]
  4.1419 -    cls.add_constructor([], visibility='public')
  4.1420 +    cls.add_constructor([])
  4.1421      ## system-condition.h: void ns3::SystemCondition::SetCondition(bool condition) [member function]
  4.1422 -    cls.add_method('SetCondition', 'void', [param('bool', 'condition')])
  4.1423 +    cls.add_method('SetCondition', 
  4.1424 +                   'void', 
  4.1425 +                   [param('bool', 'condition')])
  4.1426      ## system-condition.h: bool ns3::SystemCondition::GetCondition() [member function]
  4.1427 -    cls.add_method('GetCondition', 'bool', [])
  4.1428 +    cls.add_method('GetCondition', 
  4.1429 +                   'bool', 
  4.1430 +                   [])
  4.1431      ## system-condition.h: void ns3::SystemCondition::Signal() [member function]
  4.1432 -    cls.add_method('Signal', 'void', [])
  4.1433 +    cls.add_method('Signal', 
  4.1434 +                   'void', 
  4.1435 +                   [])
  4.1436      ## system-condition.h: void ns3::SystemCondition::Broadcast() [member function]
  4.1437 -    cls.add_method('Broadcast', 'void', [])
  4.1438 +    cls.add_method('Broadcast', 
  4.1439 +                   'void', 
  4.1440 +                   [])
  4.1441      ## system-condition.h: void ns3::SystemCondition::Wait() [member function]
  4.1442 -    cls.add_method('Wait', 'void', [])
  4.1443 +    cls.add_method('Wait', 
  4.1444 +                   'void', 
  4.1445 +                   [])
  4.1446      ## system-condition.h: bool ns3::SystemCondition::TimedWait(uint64_t ns) [member function]
  4.1447 -    cls.add_method('TimedWait', 'bool', [param('uint64_t', 'ns')])
  4.1448 +    cls.add_method('TimedWait', 
  4.1449 +                   'bool', 
  4.1450 +                   [param('uint64_t', 'ns')])
  4.1451      return
  4.1452  
  4.1453  def register_Ns3SequentialVariable_methods(root_module, cls):
  4.1454      ## random-variable.h: ns3::SequentialVariable::SequentialVariable(double f, double l, double i=1, uint32_t c=1) [constructor]
  4.1455 -    cls.add_constructor([param('double', 'f'), param('double', 'l'), param('double', 'i', default_value='1'), param('uint32_t', 'c', default_value='1')], visibility='public')
  4.1456 +    cls.add_constructor([param('double', 'f'), param('double', 'l'), param('double', 'i', default_value='1'), param('uint32_t', 'c', default_value='1')])
  4.1457      ## random-variable.h: ns3::SequentialVariable::SequentialVariable(double f, double l, ns3::RandomVariable const & i, uint32_t c=1) [constructor]
  4.1458 -    cls.add_constructor([param('double', 'f'), param('double', 'l'), param('ns3::RandomVariable&', 'i', is_const=True), param('uint32_t', 'c', default_value='1')], visibility='public')
  4.1459 +    cls.add_constructor([param('double', 'f'), param('double', 'l'), param('ns3::RandomVariable&', 'i', is_const=True), param('uint32_t', 'c', default_value='1')])
  4.1460      return
  4.1461  
  4.1462  def register_Ns3ObjectVectorChecker_methods(root_module, cls):
  4.1463      ## object-vector.h: ns3::TypeId ns3::ObjectVectorChecker::GetItemTypeId() const [member function]
  4.1464 -    cls.add_method('GetItemTypeId', 'ns3::TypeId', [], is_pure_virtual=True, is_const=True, is_virtual=True)
  4.1465 +    cls.add_method('GetItemTypeId', 
  4.1466 +                   'ns3::TypeId', 
  4.1467 +                   [], 
  4.1468 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  4.1469      cls.add_constructor([])
  4.1470      return
  4.1471  
  4.1472 @@ -1019,21 +1504,42 @@
  4.1473  
  4.1474  def register_Ns3ObjectVectorValue_methods(root_module, cls):
  4.1475      ## object-vector.h: ns3::ObjectVectorValue::ObjectVectorValue() [constructor]
  4.1476 -    cls.add_constructor([], visibility='public')
  4.1477 +    cls.add_constructor([])
  4.1478      ## object-vector.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Object>*,std::vector<ns3::Ptr<ns3::Object>, std::allocator<ns3::Ptr<ns3::Object> > > > ns3::ObjectVectorValue::Begin() const [member function]
  4.1479 -    cls.add_method('Begin', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Object >, std::vector< ns3::Ptr< ns3::Object >, std::allocator< ns3::Ptr< ns3::Object > > > >', [], is_const=True)
  4.1480 +    cls.add_method('Begin', 
  4.1481 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Object >, std::vector< ns3::Ptr< ns3::Object >, std::allocator< ns3::Ptr< ns3::Object > > > >', 
  4.1482 +                   [], 
  4.1483 +                   is_const=True)
  4.1484      ## object-vector.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Object>*,std::vector<ns3::Ptr<ns3::Object>, std::allocator<ns3::Ptr<ns3::Object> > > > ns3::ObjectVectorValue::End() const [member function]
  4.1485 -    cls.add_method('End', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Object >, std::vector< ns3::Ptr< ns3::Object >, std::allocator< ns3::Ptr< ns3::Object > > > >', [], is_const=True)
  4.1486 +    cls.add_method('End', 
  4.1487 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Object >, std::vector< ns3::Ptr< ns3::Object >, std::allocator< ns3::Ptr< ns3::Object > > > >', 
  4.1488 +                   [], 
  4.1489 +                   is_const=True)
  4.1490      ## object-vector.h: uint32_t ns3::ObjectVectorValue::GetN() const [member function]
  4.1491 -    cls.add_method('GetN', 'uint32_t', [], is_const=True)
  4.1492 +    cls.add_method('GetN', 
  4.1493 +                   'uint32_t', 
  4.1494 +                   [], 
  4.1495 +                   is_const=True)
  4.1496      ## object-vector.h: ns3::Ptr<ns3::Object> ns3::ObjectVectorValue::Get(uint32_t i) const [member function]
  4.1497 -    cls.add_method('Get', 'ns3::Ptr< ns3::Object >', [param('uint32_t', 'i')], is_const=True)
  4.1498 +    cls.add_method('Get', 
  4.1499 +                   'ns3::Ptr< ns3::Object >', 
  4.1500 +                   [param('uint32_t', 'i')], 
  4.1501 +                   is_const=True)
  4.1502      ## object-vector.h: ns3::Ptr<ns3::AttributeValue> ns3::ObjectVectorValue::Copy() const [member function]
  4.1503 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1504 +    cls.add_method('Copy', 
  4.1505 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1506 +                   [], 
  4.1507 +                   is_const=True, is_virtual=True)
  4.1508      ## object-vector.h: std::string ns3::ObjectVectorValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1509 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1510 +    cls.add_method('SerializeToString', 
  4.1511 +                   'std::string', 
  4.1512 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1513 +                   is_const=True, is_virtual=True)
  4.1514      ## object-vector.h: bool ns3::ObjectVectorValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1515 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1516 +    cls.add_method('DeserializeFromString', 
  4.1517 +                   'bool', 
  4.1518 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1519 +                   is_virtual=True)
  4.1520      return
  4.1521  
  4.1522  def register_Ns3BooleanChecker_methods(root_module, cls):
  4.1523 @@ -1042,54 +1548,100 @@
  4.1524  
  4.1525  def register_Ns3UintegerValue_methods(root_module, cls):
  4.1526      ## uinteger.h: ns3::UintegerValue::UintegerValue() [constructor]
  4.1527 -    cls.add_constructor([], visibility='public')
  4.1528 +    cls.add_constructor([])
  4.1529      ## uinteger.h: ns3::UintegerValue::UintegerValue(uint64_t const & value) [constructor]
  4.1530 -    cls.add_constructor([param('uint64_t&', 'value', is_const=True)], visibility='public')
  4.1531 +    cls.add_constructor([param('uint64_t&', 'value', is_const=True)])
  4.1532      ## uinteger.h: void ns3::UintegerValue::Set(uint64_t const & value) [member function]
  4.1533 -    cls.add_method('Set', 'void', [param('uint64_t&', 'value', is_const=True)])
  4.1534 +    cls.add_method('Set', 
  4.1535 +                   'void', 
  4.1536 +                   [param('uint64_t&', 'value', is_const=True)])
  4.1537      ## uinteger.h: uint64_t ns3::UintegerValue::Get() const [member function]
  4.1538 -    cls.add_method('Get', 'uint64_t', [], is_const=True)
  4.1539 +    cls.add_method('Get', 
  4.1540 +                   'uint64_t', 
  4.1541 +                   [], 
  4.1542 +                   is_const=True)
  4.1543      ## uinteger.h: ns3::Ptr<ns3::AttributeValue> ns3::UintegerValue::Copy() const [member function]
  4.1544 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1545 +    cls.add_method('Copy', 
  4.1546 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1547 +                   [], 
  4.1548 +                   is_const=True, is_virtual=True)
  4.1549      ## uinteger.h: std::string ns3::UintegerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1550 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1551 +    cls.add_method('SerializeToString', 
  4.1552 +                   'std::string', 
  4.1553 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1554 +                   is_const=True, is_virtual=True)
  4.1555      ## uinteger.h: bool ns3::UintegerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1556 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1557 +    cls.add_method('DeserializeFromString', 
  4.1558 +                   'bool', 
  4.1559 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1560 +                   is_virtual=True)
  4.1561      return
  4.1562  
  4.1563  def register_Ns3ObjectVectorAccessor_methods(root_module, cls):
  4.1564      ## object-vector.h: bool ns3::ObjectVectorAccessor::Set(ns3::ObjectBase * object, ns3::AttributeValue const & value) const [member function]
  4.1565 -    cls.add_method('Set', 'bool', [param('ns3::ObjectBase *', 'object'), param('ns3::AttributeValue&', 'value', is_const=True)], is_const=True, is_virtual=True)
  4.1566 +    cls.add_method('Set', 
  4.1567 +                   'bool', 
  4.1568 +                   [param('ns3::ObjectBase *', 'object'), param('ns3::AttributeValue&', 'value', is_const=True)], 
  4.1569 +                   is_const=True, is_virtual=True)
  4.1570      ## object-vector.h: bool ns3::ObjectVectorAccessor::Get(ns3::ObjectBase const * object, ns3::AttributeValue & value) const [member function]
  4.1571 -    cls.add_method('Get', 'bool', [param('ns3::ObjectBase *', 'object', transfer_ownership=False, is_const=True), param('ns3::AttributeValue&', 'value')], is_const=True, is_virtual=True)
  4.1572 +    cls.add_method('Get', 
  4.1573 +                   'bool', 
  4.1574 +                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False, is_const=True), param('ns3::AttributeValue&', 'value')], 
  4.1575 +                   is_const=True, is_virtual=True)
  4.1576      ## object-vector.h: bool ns3::ObjectVectorAccessor::HasGetter() const [member function]
  4.1577 -    cls.add_method('HasGetter', 'bool', [], is_const=True, is_virtual=True)
  4.1578 +    cls.add_method('HasGetter', 
  4.1579 +                   'bool', 
  4.1580 +                   [], 
  4.1581 +                   is_const=True, is_virtual=True)
  4.1582      ## object-vector.h: bool ns3::ObjectVectorAccessor::HasSetter() const [member function]
  4.1583 -    cls.add_method('HasSetter', 'bool', [], is_const=True, is_virtual=True)
  4.1584 +    cls.add_method('HasSetter', 
  4.1585 +                   'bool', 
  4.1586 +                   [], 
  4.1587 +                   is_const=True, is_virtual=True)
  4.1588      ## object-vector.h: bool ns3::ObjectVectorAccessor::DoGetN(ns3::ObjectBase const * object, uint32_t * n) const [member function]
  4.1589 -    cls.add_method('DoGetN', 'bool', [param('ns3::ObjectBase *', 'object', transfer_ownership=False, is_const=True), param('uint32_t *', 'n')], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  4.1590 +    cls.add_method('DoGetN', 
  4.1591 +                   'bool', 
  4.1592 +                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False, is_const=True), param('uint32_t *', 'n')], 
  4.1593 +                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  4.1594      ## object-vector.h: ns3::Ptr<ns3::Object> ns3::ObjectVectorAccessor::DoGet(ns3::ObjectBase const * object, uint32_t i) const [member function]
  4.1595 -    cls.add_method('DoGet', 'ns3::Ptr< ns3::Object >', [param('ns3::ObjectBase *', 'object', transfer_ownership=False, is_const=True), param('uint32_t', 'i')], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  4.1596 +    cls.add_method('DoGet', 
  4.1597 +                   'ns3::Ptr< ns3::Object >', 
  4.1598 +                   [param('ns3::ObjectBase *', 'object', transfer_ownership=False, is_const=True), param('uint32_t', 'i')], 
  4.1599 +                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  4.1600      cls.add_constructor([])
  4.1601      return
  4.1602  
  4.1603  def register_Ns3PointerValue_methods(root_module, cls):
  4.1604      ## pointer.h: ns3::PointerValue::PointerValue(ns3::PointerValue const & arg0) [copy constructor]
  4.1605 -    cls.add_constructor([param('ns3::PointerValue&', 'arg0', is_const=True)], visibility='public')
  4.1606 +    cls.add_constructor([param('ns3::PointerValue&', 'arg0', is_const=True)])
  4.1607      ## pointer.h: ns3::PointerValue::PointerValue() [constructor]
  4.1608 -    cls.add_constructor([], visibility='public')
  4.1609 +    cls.add_constructor([])
  4.1610      ## pointer.h: ns3::PointerValue::PointerValue(ns3::Ptr<ns3::Object> object) [constructor]
  4.1611 -    cls.add_constructor([param('ns3::Ptr< ns3::Object >', 'object')], visibility='public')
  4.1612 +    cls.add_constructor([param('ns3::Ptr< ns3::Object >', 'object')])
  4.1613      ## pointer.h: void ns3::PointerValue::SetObject(ns3::Ptr<ns3::Object> object) [member function]
  4.1614 -    cls.add_method('SetObject', 'void', [param('ns3::Ptr< ns3::Object >', 'object')])
  4.1615 +    cls.add_method('SetObject', 
  4.1616 +                   'void', 
  4.1617 +                   [param('ns3::Ptr< ns3::Object >', 'object')])
  4.1618      ## pointer.h: ns3::Ptr<ns3::Object> ns3::PointerValue::GetObject() const [member function]
  4.1619 -    cls.add_method('GetObject', 'ns3::Ptr< ns3::Object >', [], is_const=True)
  4.1620 +    cls.add_method('GetObject', 
  4.1621 +                   'ns3::Ptr< ns3::Object >', 
  4.1622 +                   [], 
  4.1623 +                   is_const=True)
  4.1624      ## pointer.h: ns3::Ptr<ns3::AttributeValue> ns3::PointerValue::Copy() const [member function]
  4.1625 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1626 +    cls.add_method('Copy', 
  4.1627 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1628 +                   [], 
  4.1629 +                   is_const=True, is_virtual=True)
  4.1630      ## pointer.h: std::string ns3::PointerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1631 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1632 +    cls.add_method('SerializeToString', 
  4.1633 +                   'std::string', 
  4.1634 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1635 +                   is_const=True, is_virtual=True)
  4.1636      ## pointer.h: bool ns3::PointerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1637 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1638 +    cls.add_method('DeserializeFromString', 
  4.1639 +                   'bool', 
  4.1640 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1641 +                   is_virtual=True)
  4.1642      return
  4.1643  
  4.1644  def register_Ns3ObjectFactoryChecker_methods(root_module, cls):
  4.1645 @@ -1102,225 +1654,409 @@
  4.1646  
  4.1647  def register_Ns3DoubleValue_methods(root_module, cls):
  4.1648      ## double.h: ns3::DoubleValue::DoubleValue() [constructor]
  4.1649 -    cls.add_constructor([], visibility='public')
  4.1650 +    cls.add_constructor([])
  4.1651      ## double.h: ns3::DoubleValue::DoubleValue(double const & value) [constructor]
  4.1652 -    cls.add_constructor([param('double&', 'value', is_const=True)], visibility='public')
  4.1653 +    cls.add_constructor([param('double&', 'value', is_const=True)])
  4.1654      ## double.h: void ns3::DoubleValue::Set(double const & value) [member function]
  4.1655 -    cls.add_method('Set', 'void', [param('double&', 'value', is_const=True)])
  4.1656 +    cls.add_method('Set', 
  4.1657 +                   'void', 
  4.1658 +                   [param('double&', 'value', is_const=True)])
  4.1659      ## double.h: double ns3::DoubleValue::Get() const [member function]
  4.1660 -    cls.add_method('Get', 'double', [], is_const=True)
  4.1661 +    cls.add_method('Get', 
  4.1662 +                   'double', 
  4.1663 +                   [], 
  4.1664 +                   is_const=True)
  4.1665      ## double.h: ns3::Ptr<ns3::AttributeValue> ns3::DoubleValue::Copy() const [member function]
  4.1666 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1667 +    cls.add_method('Copy', 
  4.1668 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1669 +                   [], 
  4.1670 +                   is_const=True, is_virtual=True)
  4.1671      ## double.h: std::string ns3::DoubleValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1672 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1673 +    cls.add_method('SerializeToString', 
  4.1674 +                   'std::string', 
  4.1675 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1676 +                   is_const=True, is_virtual=True)
  4.1677      ## double.h: bool ns3::DoubleValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1678 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1679 +    cls.add_method('DeserializeFromString', 
  4.1680 +                   'bool', 
  4.1681 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1682 +                   is_virtual=True)
  4.1683      return
  4.1684  
  4.1685  def register_Ns3TypeIdValue_methods(root_module, cls):
  4.1686      ## type-id.h: ns3::TypeIdValue::TypeIdValue() [constructor]
  4.1687 -    cls.add_constructor([], visibility='public')
  4.1688 +    cls.add_constructor([])
  4.1689      ## type-id.h: ns3::TypeIdValue::TypeIdValue(ns3::TypeId const & value) [constructor]
  4.1690 -    cls.add_constructor([param('ns3::TypeId&', 'value', is_const=True)], visibility='public')
  4.1691 +    cls.add_constructor([param('ns3::TypeId&', 'value', is_const=True)])
  4.1692      ## type-id.h: void ns3::TypeIdValue::Set(ns3::TypeId const & value) [member function]
  4.1693 -    cls.add_method('Set', 'void', [param('ns3::TypeId&', 'value', is_const=True)])
  4.1694 +    cls.add_method('Set', 
  4.1695 +                   'void', 
  4.1696 +                   [param('ns3::TypeId&', 'value', is_const=True)])
  4.1697      ## type-id.h: ns3::TypeId ns3::TypeIdValue::Get() const [member function]
  4.1698 -    cls.add_method('Get', 'ns3::TypeId', [], is_const=True)
  4.1699 +    cls.add_method('Get', 
  4.1700 +                   'ns3::TypeId', 
  4.1701 +                   [], 
  4.1702 +                   is_const=True)
  4.1703      ## type-id.h: ns3::Ptr<ns3::AttributeValue> ns3::TypeIdValue::Copy() const [member function]
  4.1704 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1705 +    cls.add_method('Copy', 
  4.1706 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1707 +                   [], 
  4.1708 +                   is_const=True, is_virtual=True)
  4.1709      ## type-id.h: std::string ns3::TypeIdValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1710 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1711 +    cls.add_method('SerializeToString', 
  4.1712 +                   'std::string', 
  4.1713 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1714 +                   is_const=True, is_virtual=True)
  4.1715      ## type-id.h: bool ns3::TypeIdValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1716 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1717 +    cls.add_method('DeserializeFromString', 
  4.1718 +                   'bool', 
  4.1719 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1720 +                   is_virtual=True)
  4.1721      return
  4.1722  
  4.1723  def register_Ns3EnumValue_methods(root_module, cls):
  4.1724      ## enum.h: ns3::EnumValue::EnumValue() [constructor]
  4.1725 -    cls.add_constructor([], visibility='public')
  4.1726 +    cls.add_constructor([])
  4.1727      ## enum.h: ns3::EnumValue::EnumValue(int v) [constructor]
  4.1728 -    cls.add_constructor([param('int', 'v')], visibility='public')
  4.1729 +    cls.add_constructor([param('int', 'v')])
  4.1730      ## enum.h: void ns3::EnumValue::Set(int v) [member function]
  4.1731 -    cls.add_method('Set', 'void', [param('int', 'v')])
  4.1732 +    cls.add_method('Set', 
  4.1733 +                   'void', 
  4.1734 +                   [param('int', 'v')])
  4.1735      ## enum.h: int ns3::EnumValue::Get() const [member function]
  4.1736 -    cls.add_method('Get', 'int', [], is_const=True)
  4.1737 +    cls.add_method('Get', 
  4.1738 +                   'int', 
  4.1739 +                   [], 
  4.1740 +                   is_const=True)
  4.1741      ## enum.h: ns3::Ptr<ns3::AttributeValue> ns3::EnumValue::Copy() const [member function]
  4.1742 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1743 +    cls.add_method('Copy', 
  4.1744 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1745 +                   [], 
  4.1746 +                   is_const=True, is_virtual=True)
  4.1747      ## enum.h: std::string ns3::EnumValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1748 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1749 +    cls.add_method('SerializeToString', 
  4.1750 +                   'std::string', 
  4.1751 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1752 +                   is_const=True, is_virtual=True)
  4.1753      ## enum.h: bool ns3::EnumValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1754 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1755 +    cls.add_method('DeserializeFromString', 
  4.1756 +                   'bool', 
  4.1757 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1758 +                   is_virtual=True)
  4.1759      return
  4.1760  
  4.1761  def register_Ns3RandomVariableValue_methods(root_module, cls):
  4.1762      ## random-variable.h: ns3::RandomVariableValue::RandomVariableValue() [constructor]
  4.1763 -    cls.add_constructor([], visibility='public')
  4.1764 +    cls.add_constructor([])
  4.1765      ## random-variable.h: ns3::RandomVariableValue::RandomVariableValue(ns3::RandomVariable const & value) [constructor]
  4.1766 -    cls.add_constructor([param('ns3::RandomVariable&', 'value', is_const=True)], visibility='public')
  4.1767 +    cls.add_constructor([param('ns3::RandomVariable&', 'value', is_const=True)])
  4.1768      ## random-variable.h: void ns3::RandomVariableValue::Set(ns3::RandomVariable const & value) [member function]
  4.1769 -    cls.add_method('Set', 'void', [param('ns3::RandomVariable&', 'value', is_const=True)])
  4.1770 +    cls.add_method('Set', 
  4.1771 +                   'void', 
  4.1772 +                   [param('ns3::RandomVariable&', 'value', is_const=True)])
  4.1773      ## random-variable.h: ns3::RandomVariable ns3::RandomVariableValue::Get() const [member function]
  4.1774 -    cls.add_method('Get', 'ns3::RandomVariable', [], is_const=True)
  4.1775 +    cls.add_method('Get', 
  4.1776 +                   'ns3::RandomVariable', 
  4.1777 +                   [], 
  4.1778 +                   is_const=True)
  4.1779      ## random-variable.h: ns3::Ptr<ns3::AttributeValue> ns3::RandomVariableValue::Copy() const [member function]
  4.1780 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1781 +    cls.add_method('Copy', 
  4.1782 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1783 +                   [], 
  4.1784 +                   is_const=True, is_virtual=True)
  4.1785      ## random-variable.h: std::string ns3::RandomVariableValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1786 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1787 +    cls.add_method('SerializeToString', 
  4.1788 +                   'std::string', 
  4.1789 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1790 +                   is_const=True, is_virtual=True)
  4.1791      ## random-variable.h: bool ns3::RandomVariableValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1792 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1793 +    cls.add_method('DeserializeFromString', 
  4.1794 +                   'bool', 
  4.1795 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1796 +                   is_virtual=True)
  4.1797      return
  4.1798  
  4.1799  def register_Ns3ObjectFactoryValue_methods(root_module, cls):
  4.1800      ## object-factory.h: ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor]
  4.1801 -    cls.add_constructor([], visibility='public')
  4.1802 +    cls.add_constructor([])
  4.1803      ## object-factory.h: ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor]
  4.1804 -    cls.add_constructor([param('ns3::ObjectFactory&', 'value', is_const=True)], visibility='public')
  4.1805 +    cls.add_constructor([param('ns3::ObjectFactory&', 'value', is_const=True)])
  4.1806      ## object-factory.h: void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function]
  4.1807 -    cls.add_method('Set', 'void', [param('ns3::ObjectFactory&', 'value', is_const=True)])
  4.1808 +    cls.add_method('Set', 
  4.1809 +                   'void', 
  4.1810 +                   [param('ns3::ObjectFactory&', 'value', is_const=True)])
  4.1811      ## object-factory.h: ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function]
  4.1812 -    cls.add_method('Get', 'ns3::ObjectFactory', [], is_const=True)
  4.1813 +    cls.add_method('Get', 
  4.1814 +                   'ns3::ObjectFactory', 
  4.1815 +                   [], 
  4.1816 +                   is_const=True)
  4.1817      ## object-factory.h: ns3::Ptr<ns3::AttributeValue> ns3::ObjectFactoryValue::Copy() const [member function]
  4.1818 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1819 +    cls.add_method('Copy', 
  4.1820 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1821 +                   [], 
  4.1822 +                   is_const=True, is_virtual=True)
  4.1823      ## object-factory.h: std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1824 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1825 +    cls.add_method('SerializeToString', 
  4.1826 +                   'std::string', 
  4.1827 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1828 +                   is_const=True, is_virtual=True)
  4.1829      ## object-factory.h: bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1830 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1831 +    cls.add_method('DeserializeFromString', 
  4.1832 +                   'bool', 
  4.1833 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1834 +                   is_virtual=True)
  4.1835      return
  4.1836  
  4.1837  def register_Ns3IntegerValue_methods(root_module, cls):
  4.1838      ## integer.h: ns3::IntegerValue::IntegerValue() [constructor]
  4.1839 -    cls.add_constructor([], visibility='public')
  4.1840 +    cls.add_constructor([])
  4.1841      ## integer.h: ns3::IntegerValue::IntegerValue(int64_t const & value) [constructor]
  4.1842 -    cls.add_constructor([param('int64_t&', 'value', is_const=True)], visibility='public')
  4.1843 +    cls.add_constructor([param('int64_t&', 'value', is_const=True)])
  4.1844      ## integer.h: void ns3::IntegerValue::Set(int64_t const & value) [member function]
  4.1845 -    cls.add_method('Set', 'void', [param('int64_t&', 'value', is_const=True)])
  4.1846 +    cls.add_method('Set', 
  4.1847 +                   'void', 
  4.1848 +                   [param('int64_t&', 'value', is_const=True)])
  4.1849      ## integer.h: int64_t ns3::IntegerValue::Get() const [member function]
  4.1850 -    cls.add_method('Get', 'int64_t', [], is_const=True)
  4.1851 +    cls.add_method('Get', 
  4.1852 +                   'int64_t', 
  4.1853 +                   [], 
  4.1854 +                   is_const=True)
  4.1855      ## integer.h: ns3::Ptr<ns3::AttributeValue> ns3::IntegerValue::Copy() const [member function]
  4.1856 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1857 +    cls.add_method('Copy', 
  4.1858 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1859 +                   [], 
  4.1860 +                   is_const=True, is_virtual=True)
  4.1861      ## integer.h: std::string ns3::IntegerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1862 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1863 +    cls.add_method('SerializeToString', 
  4.1864 +                   'std::string', 
  4.1865 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1866 +                   is_const=True, is_virtual=True)
  4.1867      ## integer.h: bool ns3::IntegerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1868 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1869 +    cls.add_method('DeserializeFromString', 
  4.1870 +                   'bool', 
  4.1871 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1872 +                   is_virtual=True)
  4.1873      return
  4.1874  
  4.1875  def register_Ns3BooleanValue_methods(root_module, cls):
  4.1876      ## boolean.h: ns3::BooleanValue::BooleanValue(ns3::BooleanValue const & arg0) [copy constructor]
  4.1877 -    cls.add_constructor([param('ns3::BooleanValue&', 'arg0', is_const=True)], visibility='public')
  4.1878 +    cls.add_constructor([param('ns3::BooleanValue&', 'arg0', is_const=True)])
  4.1879      ## boolean.h: ns3::BooleanValue::BooleanValue() [constructor]
  4.1880 -    cls.add_constructor([], visibility='public')
  4.1881 +    cls.add_constructor([])
  4.1882      ## boolean.h: ns3::BooleanValue::BooleanValue(bool value) [constructor]
  4.1883 -    cls.add_constructor([param('bool', 'value')], visibility='public')
  4.1884 +    cls.add_constructor([param('bool', 'value')])
  4.1885      ## boolean.h: ns3::Ptr<ns3::AttributeValue> ns3::BooleanValue::Copy() const [member function]
  4.1886 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1887 +    cls.add_method('Copy', 
  4.1888 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1889 +                   [], 
  4.1890 +                   is_const=True, is_virtual=True)
  4.1891      ## boolean.h: bool ns3::BooleanValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1892 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1893 +    cls.add_method('DeserializeFromString', 
  4.1894 +                   'bool', 
  4.1895 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1896 +                   is_virtual=True)
  4.1897      ## boolean.h: bool ns3::BooleanValue::Get() const [member function]
  4.1898 -    cls.add_method('Get', 'bool', [], is_const=True)
  4.1899 +    cls.add_method('Get', 
  4.1900 +                   'bool', 
  4.1901 +                   [], 
  4.1902 +                   is_const=True)
  4.1903      ## boolean.h: std::string ns3::BooleanValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1904 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1905 +    cls.add_method('SerializeToString', 
  4.1906 +                   'std::string', 
  4.1907 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1908 +                   is_const=True, is_virtual=True)
  4.1909      ## boolean.h: void ns3::BooleanValue::Set(bool value) [member function]
  4.1910 -    cls.add_method('Set', 'void', [param('bool', 'value')])
  4.1911 +    cls.add_method('Set', 
  4.1912 +                   'void', 
  4.1913 +                   [param('bool', 'value')])
  4.1914      cls.add_output_stream_operator()
  4.1915      return
  4.1916  
  4.1917  def register_Ns3StringValue_methods(root_module, cls):
  4.1918      ## string.h: ns3::StringValue::StringValue() [constructor]
  4.1919 -    cls.add_constructor([], visibility='public')
  4.1920 +    cls.add_constructor([])
  4.1921      ## string.h: ns3::StringValue::StringValue(std::string const & value) [constructor]
  4.1922 -    cls.add_constructor([param('std::string&', 'value', is_const=True)], visibility='public')
  4.1923 +    cls.add_constructor([param('std::string&', 'value', is_const=True)])
  4.1924      ## string.h: void ns3::StringValue::Set(std::string const & value) [member function]
  4.1925 -    cls.add_method('Set', 'void', [param('std::string&', 'value', is_const=True)])
  4.1926 +    cls.add_method('Set', 
  4.1927 +                   'void', 
  4.1928 +                   [param('std::string&', 'value', is_const=True)])
  4.1929      ## string.h: std::string ns3::StringValue::Get() const [member function]
  4.1930 -    cls.add_method('Get', 'std::string', [], is_const=True)
  4.1931 +    cls.add_method('Get', 
  4.1932 +                   'std::string', 
  4.1933 +                   [], 
  4.1934 +                   is_const=True)
  4.1935      ## string.h: ns3::Ptr<ns3::AttributeValue> ns3::StringValue::Copy() const [member function]
  4.1936 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
  4.1937 +    cls.add_method('Copy', 
  4.1938 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1939 +                   [], 
  4.1940 +                   is_const=True, is_virtual=True)
  4.1941      ## string.h: std::string ns3::StringValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1942 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
  4.1943 +    cls.add_method('SerializeToString', 
  4.1944 +                   'std::string', 
  4.1945 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1946 +                   is_const=True, is_virtual=True)
  4.1947      ## string.h: bool ns3::StringValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1948 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
  4.1949 +    cls.add_method('DeserializeFromString', 
  4.1950 +                   'bool', 
  4.1951 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1952 +                   is_virtual=True)
  4.1953      return
  4.1954  
  4.1955  def register_Ns3EmptyAttributeValue_methods(root_module, cls):
  4.1956      ## attribute.h: ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]
  4.1957 -    cls.add_constructor([param('ns3::EmptyAttributeValue&', 'arg0', is_const=True)], visibility='public')
  4.1958 +    cls.add_constructor([param('ns3::EmptyAttributeValue&', 'arg0', is_const=True)])
  4.1959      ## attribute.h: ns3::EmptyAttributeValue::EmptyAttributeValue() [constructor]
  4.1960 -    cls.add_constructor([], visibility='public')
  4.1961 +    cls.add_constructor([])
  4.1962      ## attribute.h: ns3::Ptr<ns3::AttributeValue> ns3::EmptyAttributeValue::Copy() const [member function]
  4.1963 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, visibility='private', is_virtual=True)
  4.1964 +    cls.add_method('Copy', 
  4.1965 +                   'ns3::Ptr< ns3::AttributeValue >', 
  4.1966 +                   [], 
  4.1967 +                   is_const=True, visibility='private', is_virtual=True)
  4.1968      ## attribute.h: std::string ns3::EmptyAttributeValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
  4.1969 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, visibility='private', is_virtual=True)
  4.1970 +    cls.add_method('SerializeToString', 
  4.1971 +                   'std::string', 
  4.1972 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1973 +                   is_const=True, visibility='private', is_virtual=True)
  4.1974      ## attribute.h: bool ns3::EmptyAttributeValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
  4.1975 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], visibility='private', is_virtual=True)
  4.1976 +    cls.add_method('DeserializeFromString', 
  4.1977 +                   'bool', 
  4.1978 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
  4.1979 +                   visibility='private', is_virtual=True)
  4.1980      return
  4.1981  
  4.1982  def register_Ns3TracedValue__Unsigned_int_methods(root_module, cls):
  4.1983      ## traced-value.h: ns3::TracedValue<unsigned int>::TracedValue() [constructor]
  4.1984 -    cls.add_constructor([], visibility='public')
  4.1985 +    cls.add_constructor([])
  4.1986      ## traced-value.h: ns3::TracedValue<unsigned int>::TracedValue(ns3::TracedValue<unsigned int> const & o) [copy constructor]
  4.1987 -    cls.add_constructor([param('ns3::TracedValue< unsigned int >&', 'o', is_const=True)], visibility='public')
  4.1988 +    cls.add_constructor([param('ns3::TracedValue< unsigned int >&', 'o', is_const=True)])
  4.1989      ## traced-value.h: ns3::TracedValue<unsigned int>::TracedValue(unsigned int const & v) [constructor]
  4.1990 -    cls.add_constructor([param('unsigned int&', 'v', is_const=True)], visibility='public')
  4.1991 +    cls.add_constructor([param('unsigned int&', 'v', is_const=True)])
  4.1992      ## traced-value.h: ns3::TracedValue<unsigned int>::TracedValue(ns3::IntegerValue const & value) [constructor]
  4.1993 -    cls.add_constructor([param('ns3::IntegerValue&', 'value', is_const=True)], visibility='public')
  4.1994 +    cls.add_constructor([param('ns3::IntegerValue&', 'value', is_const=True)])
  4.1995      ## traced-value.h: ns3::TracedValue<unsigned int>::TracedValue(ns3::UintegerValue const & value) [constructor]
  4.1996 -    cls.add_constructor([param('ns3::UintegerValue&', 'value', is_const=True)], visibility='public')
  4.1997 +    cls.add_constructor([param('ns3::UintegerValue&', 'value', is_const=True)])
  4.1998      ## traced-value.h: ns3::TracedValue<unsigned int>::TracedValue(ns3::BooleanValue const & value) [constructor]
  4.1999 -    cls.add_constructor([param('ns3::BooleanValue&', 'value', is_const=True)], visibility='public')
  4.2000 +    cls.add_constructor([param('ns3::BooleanValue&', 'value', is_const=True)])
  4.2001      ## traced-value.h: ns3::TracedValue<unsigned int>::TracedValue(ns3::EnumValue const & value) [constructor]
  4.2002 -    cls.add_constructor([param('ns3::EnumValue&', 'value', is_const=True)], visibility='public')
  4.2003 +    cls.add_constructor([param('ns3::EnumValue&', 'value', is_const=True)])
  4.2004      ## traced-value.h: void ns3::TracedValue<unsigned int>::ConnectWithoutContext(ns3::CallbackBase const & cb) [member function]
  4.2005 -    cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2006 +    cls.add_method('ConnectWithoutContext', 
  4.2007 +                   'void', 
  4.2008 +                   [param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2009      ## traced-value.h: void ns3::TracedValue<unsigned int>::Connect(ns3::CallbackBase const & cb, std::string path) [member function]
  4.2010 -    cls.add_method('Connect', 'void', [param('ns3::CallbackBase&', 'cb', is_const=True), param('std::string', 'path')])
  4.2011 +    cls.add_method('Connect', 
  4.2012 +                   'void', 
  4.2013 +                   [param('ns3::CallbackBase&', 'cb', is_const=True), param('std::string', 'path')])
  4.2014      ## traced-value.h: void ns3::TracedValue<unsigned int>::DisconnectWithoutContext(ns3::CallbackBase const & cb) [member function]
  4.2015 -    cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2016 +    cls.add_method('DisconnectWithoutContext', 
  4.2017 +                   'void', 
  4.2018 +                   [param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2019      ## traced-value.h: void ns3::TracedValue<unsigned int>::Disconnect(ns3::CallbackBase const & cb, std::string path) [member function]
  4.2020 -    cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase&', 'cb', is_const=True), param('std::string', 'path')])
  4.2021 +    cls.add_method('Disconnect', 
  4.2022 +                   'void', 
  4.2023 +                   [param('ns3::CallbackBase&', 'cb', is_const=True), param('std::string', 'path')])
  4.2024      ## traced-value.h: void ns3::TracedValue<unsigned int>::Set(unsigned int const & v) [member function]
  4.2025 -    cls.add_method('Set', 'void', [param('unsigned int&', 'v', is_const=True)])
  4.2026 +    cls.add_method('Set', 
  4.2027 +                   'void', 
  4.2028 +                   [param('unsigned int&', 'v', is_const=True)])
  4.2029      ## traced-value.h: unsigned int ns3::TracedValue<unsigned int>::Get() const [member function]
  4.2030 -    cls.add_method('Get', 'unsigned int', [], is_const=True)
  4.2031 +    cls.add_method('Get', 
  4.2032 +                   'unsigned int', 
  4.2033 +                   [], 
  4.2034 +                   is_const=True)
  4.2035      return
  4.2036  
  4.2037  def register_functions(root_module):
  4.2038      module = root_module
  4.2039      ## boolean.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeBooleanChecker() [free function]
  4.2040 -    module.add_function('MakeBooleanChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [])
  4.2041 +    module.add_function('MakeBooleanChecker', 
  4.2042 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2043 +                        [])
  4.2044      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2045 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['double'])
  4.2046 +    module.add_function('TypeNameGet', 
  4.2047 +                        'std::string', 
  4.2048 +                        [], 
  4.2049 +                        template_parameters=['double'])
  4.2050      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2051 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['float'])
  4.2052 +    module.add_function('TypeNameGet', 
  4.2053 +                        'std::string', 
  4.2054 +                        [], 
  4.2055 +                        template_parameters=['float'])
  4.2056      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2057 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['long'])
  4.2058 +    module.add_function('TypeNameGet', 
  4.2059 +                        'std::string', 
  4.2060 +                        [], 
  4.2061 +                        template_parameters=['long'])
  4.2062      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2063 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['int'])
  4.2064 +    module.add_function('TypeNameGet', 
  4.2065 +                        'std::string', 
  4.2066 +                        [], 
  4.2067 +                        template_parameters=['int'])
  4.2068      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2069 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['short'])
  4.2070 +    module.add_function('TypeNameGet', 
  4.2071 +                        'std::string', 
  4.2072 +                        [], 
  4.2073 +                        template_parameters=['short'])
  4.2074      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2075 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['signed char'])
  4.2076 +    module.add_function('TypeNameGet', 
  4.2077 +                        'std::string', 
  4.2078 +                        [], 
  4.2079 +                        template_parameters=['signed char'])
  4.2080      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2081 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['unsigned long'])
  4.2082 +    module.add_function('TypeNameGet', 
  4.2083 +                        'std::string', 
  4.2084 +                        [], 
  4.2085 +                        template_parameters=['unsigned long'])
  4.2086      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2087 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['unsigned int'])
  4.2088 +    module.add_function('TypeNameGet', 
  4.2089 +                        'std::string', 
  4.2090 +                        [], 
  4.2091 +                        template_parameters=['unsigned int'])
  4.2092      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2093 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['unsigned short'])
  4.2094 +    module.add_function('TypeNameGet', 
  4.2095 +                        'std::string', 
  4.2096 +                        [], 
  4.2097 +                        template_parameters=['unsigned short'])
  4.2098      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
  4.2099 -    module.add_function('TypeNameGet', 'std::string', [], template_parameters=['unsigned char'])
  4.2100 +    module.add_function('TypeNameGet', 
  4.2101 +                        'std::string', 
  4.2102 +                        [], 
  4.2103 +                        template_parameters=['unsigned char'])
  4.2104      ## string.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeStringChecker() [free function]
  4.2105 -    module.add_function('MakeStringChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [])
  4.2106 +    module.add_function('MakeStringChecker', 
  4.2107 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2108 +                        [])
  4.2109      ## enum.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeEnumChecker(int v1, std::string n1, int v2=0, std::string n2="", int v3=0, std::string n3="", int v4=0, std::string n4="", int v5=0, std::string n5="", int v6=0, std::string n6="", int v7=0, std::string n7="", int v8=0, std::string n8="", int v9=0, std::string n9="", int v10=0, std::string n10="", int v11=0, std::string n11="", int v12=0, std::string n12="") [free function]
  4.2110 -    module.add_function('MakeEnumChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [param('int', 'v1'), param('std::string', 'n1'), param('int', 'v2', default_value='0'), param('std::string', 'n2', default_value='""'), param('int', 'v3', default_value='0'), param('std::string', 'n3', default_value='""'), param('int', 'v4', default_value='0'), param('std::string', 'n4', default_value='""'), param('int', 'v5', default_value='0'), param('std::string', 'n5', default_value='""'), param('int', 'v6', default_value='0'), param('std::string', 'n6', default_value='""'), param('int', 'v7', default_value='0'), param('std::string', 'n7', default_value='""'), param('int', 'v8', default_value='0'), param('std::string', 'n8', default_value='""'), param('int', 'v9', default_value='0'), param('std::string', 'n9', default_value='""'), param('int', 'v10', default_value='0'), param('std::string', 'n10', default_value='""'), param('int', 'v11', default_value='0'), param('std::string', 'n11', default_value='""'), param('int', 'v12', default_value='0'), param('std::string', 'n12', default_value='""')])
  4.2111 +    module.add_function('MakeEnumChecker', 
  4.2112 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2113 +                        [param('int', 'v1'), param('std::string', 'n1'), param('int', 'v2', default_value='0'), param('std::string', 'n2', default_value='""'), param('int', 'v3', default_value='0'), param('std::string', 'n3', default_value='""'), param('int', 'v4', default_value='0'), param('std::string', 'n4', default_value='""'), param('int', 'v5', default_value='0'), param('std::string', 'n5', default_value='""'), param('int', 'v6', default_value='0'), param('std::string', 'n6', default_value='""'), param('int', 'v7', default_value='0'), param('std::string', 'n7', default_value='""'), param('int', 'v8', default_value='0'), param('std::string', 'n8', default_value='""'), param('int', 'v9', default_value='0'), param('std::string', 'n9', default_value='""'), param('int', 'v10', default_value='0'), param('std::string', 'n10', default_value='""'), param('int', 'v11', default_value='0'), param('std::string', 'n11', default_value='""'), param('int', 'v12', default_value='0'), param('std::string', 'n12', default_value='""')])
  4.2114      ## type-id.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTypeIdChecker() [free function]
  4.2115 -    module.add_function('MakeTypeIdChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [])
  4.2116 +    module.add_function('MakeTypeIdChecker', 
  4.2117 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2118 +                        [])
  4.2119      ## ptr.h: extern ns3::Ptr<ns3::PointerValue> ns3::Create() [free function]
  4.2120 -    module.add_function('Create', 'ns3::Ptr< ns3::PointerValue >', [], template_parameters=['ns3::PointerValue'])
  4.2121 +    module.add_function('Create', 
  4.2122 +                        'ns3::Ptr< ns3::PointerValue >', 
  4.2123 +                        [], 
  4.2124 +                        template_parameters=['ns3::PointerValue'])
  4.2125      ## ptr.h: extern ns3::Ptr<ns3::ObjectVectorValue> ns3::Create() [free function]
  4.2126 -    module.add_function('Create', 'ns3::Ptr< ns3::ObjectVectorValue >', [], template_parameters=['ns3::ObjectVectorValue'])
  4.2127 +    module.add_function('Create', 
  4.2128 +                        'ns3::Ptr< ns3::ObjectVectorValue >', 
  4.2129 +                        [], 
  4.2130 +                        template_parameters=['ns3::ObjectVectorValue'])
  4.2131      ## object-factory.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeObjectFactoryChecker() [free function]
  4.2132 -    module.add_function('MakeObjectFactoryChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [])
  4.2133 +    module.add_function('MakeObjectFactoryChecker', 
  4.2134 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2135 +                        [])
  4.2136      ## breakpoint.h: extern void ns3::BreakpointFallback() [free function]
  4.2137 -    module.add_function('BreakpointFallback', 'void', [])
  4.2138 +    module.add_function('BreakpointFallback', 
  4.2139 +                        'void', 
  4.2140 +                        [])
  4.2141      ## random-variable.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeRandomVariableChecker() [free function]
  4.2142 -    module.add_function('MakeRandomVariableChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [])
  4.2143 +    module.add_function('MakeRandomVariableChecker', 
  4.2144 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2145 +                        [])
  4.2146      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
  4.2147      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
  4.2148      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
  4.2149 @@ -1329,11 +2065,17 @@
  4.2150  
  4.2151  def register_functions_ns3_internal(module, root_module):
  4.2152      ## uinteger.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::internal::MakeUintegerChecker(uint64_t min, uint64_t max, std::string name) [free function]
  4.2153 -    module.add_function('MakeUintegerChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [param('uint64_t', 'min'), param('uint64_t', 'max'), param('std::string', 'name')])
  4.2154 +    module.add_function('MakeUintegerChecker', 
  4.2155 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2156 +                        [param('uint64_t', 'min'), param('uint64_t', 'max'), param('std::string', 'name')])
  4.2157      ## integer.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::internal::MakeIntegerChecker(int64_t min, int64_t max, std::string name) [free function]
  4.2158 -    module.add_function('MakeIntegerChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [param('int64_t', 'min'), param('int64_t', 'max'), param('std::string', 'name')])
  4.2159 +    module.add_function('MakeIntegerChecker', 
  4.2160 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2161 +                        [param('int64_t', 'min'), param('int64_t', 'max'), param('std::string', 'name')])
  4.2162      ## double.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::internal::MakeDoubleChecker(double min, double max, std::string name) [free function]
  4.2163 -    module.add_function('MakeDoubleChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [param('double', 'min'), param('double', 'max'), param('std::string', 'name')])
  4.2164 +    module.add_function('MakeDoubleChecker', 
  4.2165 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
  4.2166 +                        [param('double', 'min'), param('double', 'max'), param('std::string', 'name')])
  4.2167      return
  4.2168  
  4.2169  def register_functions_ns3_TimeStepPrecision(module, root_module):
  4.2170 @@ -1341,31 +2083,57 @@
  4.2171  
  4.2172  def register_functions_ns3_Config(module, root_module):
  4.2173      ## config.h: extern bool ns3::Config::SetDefaultFailSafe(std::string name, ns3::AttributeValue const & value) [free function]
  4.2174 -    module.add_function('SetDefaultFailSafe', 'bool', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2175 +    module.add_function('SetDefaultFailSafe', 
  4.2176 +                        'bool', 
  4.2177 +                        [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2178      ## config.h: extern void ns3::Config::DisconnectWithoutContext(std::string path, ns3::CallbackBase const & cb) [free function]
  4.2179 -    module.add_function('DisconnectWithoutContext', 'void', [param('std::string', 'path'), param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2180 +    module.add_function('DisconnectWithoutContext', 
  4.2181 +                        'void', 
  4.2182 +                        [param('std::string', 'path'), param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2183      ## config.h: extern void ns3::Config::SetDefault(std::string name, ns3::AttributeValue const & value) [free function]
  4.2184 -    module.add_function('SetDefault', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2185 +    module.add_function('SetDefault', 
  4.2186 +                        'void', 
  4.2187 +                        [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2188      ## config.h: extern void ns3::Config::Connect(std::string path, ns3::CallbackBase const & cb) [free function]
  4.2189 -    module.add_function('Connect', 'void', [param('std::string', 'path'), param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2190 +    module.add_function('Connect', 
  4.2191 +                        'void', 
  4.2192 +                        [param('std::string', 'path'), param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2193      ## config.h: extern ns3::Ptr<ns3::Object> ns3::Config::GetRootNamespaceObject(uint32_t i) [free function]
  4.2194 -    module.add_function('GetRootNamespaceObject', 'ns3::Ptr< ns3::Object >', [param('uint32_t', 'i')])
  4.2195 +    module.add_function('GetRootNamespaceObject', 
  4.2196 +                        'ns3::Ptr< ns3::Object >', 
  4.2197 +                        [param('uint32_t', 'i')])
  4.2198      ## config.h: extern void ns3::Config::ConnectWithoutContext(std::string path, ns3::CallbackBase const & cb) [free function]
  4.2199 -    module.add_function('ConnectWithoutContext', 'void', [param('std::string', 'path'), param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2200 +    module.add_function('ConnectWithoutContext', 
  4.2201 +                        'void', 
  4.2202 +                        [param('std::string', 'path'), param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2203      ## config.h: extern void ns3::Config::UnregisterRootNamespaceObject(ns3::Ptr<ns3::Object> obj) [free function]
  4.2204 -    module.add_function('UnregisterRootNamespaceObject', 'void', [param('ns3::Ptr< ns3::Object >', 'obj')])
  4.2205 +    module.add_function('UnregisterRootNamespaceObject', 
  4.2206 +                        'void', 
  4.2207 +                        [param('ns3::Ptr< ns3::Object >', 'obj')])
  4.2208      ## config.h: extern bool ns3::Config::SetGlobalFailSafe(std::string name, ns3::AttributeValue const & value) [free function]
  4.2209 -    module.add_function('SetGlobalFailSafe', 'bool', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2210 +    module.add_function('SetGlobalFailSafe', 
  4.2211 +                        'bool', 
  4.2212 +                        [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2213      ## config.h: extern uint32_t ns3::Config::GetRootNamespaceObjectN() [free function]
  4.2214 -    module.add_function('GetRootNamespaceObjectN', 'uint32_t', [])
  4.2215 +    module.add_function('GetRootNamespaceObjectN', 
  4.2216 +                        'uint32_t', 
  4.2217 +                        [])
  4.2218      ## config.h: extern void ns3::Config::Set(std::string path, ns3::AttributeValue const & value) [free function]
  4.2219 -    module.add_function('Set', 'void', [param('std::string', 'path'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2220 +    module.add_function('Set', 
  4.2221 +                        'void', 
  4.2222 +                        [param('std::string', 'path'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2223      ## config.h: extern void ns3::Config::SetGlobal(std::string name, ns3::AttributeValue const & value) [free function]
  4.2224 -    module.add_function('SetGlobal', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2225 +    module.add_function('SetGlobal', 
  4.2226 +                        'void', 
  4.2227 +                        [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
  4.2228      ## config.h: extern void ns3::Config::RegisterRootNamespaceObject(ns3::Ptr<ns3::Object> obj) [free function]
  4.2229 -    module.add_function('RegisterRootNamespaceObject', 'void', [param('ns3::Ptr< ns3::Object >', 'obj')])
  4.2230 +    module.add_function('RegisterRootNamespaceObject', 
  4.2231 +                        'void', 
  4.2232 +                        [param('ns3::Ptr< ns3::Object >', 'obj')])
  4.2233      ## config.h: extern void ns3::Config::Disconnect(std::string path, ns3::CallbackBase const & cb) [free function]
  4.2234 -    module.add_function('Disconnect', 'void', [param('std::string', 'path'), param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2235 +    module.add_function('Disconnect', 
  4.2236 +                        'void', 
  4.2237 +                        [param('std::string', 'path'), param('ns3::CallbackBase&', 'cb', is_const=True)])
  4.2238      return
  4.2239  
  4.2240  def register_functions_ns3_olsr(module, root_module):
     5.1 --- a/bindings/python/ns3_module_csma.py	Mon Jul 21 11:43:05 2008 +0100
     5.2 +++ b/bindings/python/ns3_module_csma.py	Mon Jul 21 15:30:15 2008 +0100
     5.3 @@ -1,4 +1,4 @@
     5.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     5.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     5.6  
     5.7  def register_types(module):
     5.8      root_module = module.get_root()
     5.9 @@ -69,11 +69,13 @@
    5.10      ## csma-channel.h: ns3::CsmaDeviceRec::active [variable]
    5.11      cls.add_instance_attribute('active', 'bool', is_const=False)
    5.12      ## csma-channel.h: ns3::CsmaDeviceRec::CsmaDeviceRec() [constructor]
    5.13 -    cls.add_constructor([], visibility='public')
    5.14 +    cls.add_constructor([])
    5.15      ## csma-channel.h: ns3::CsmaDeviceRec::CsmaDeviceRec(ns3::Ptr<ns3::CsmaNetDevice> device) [constructor]
    5.16 -    cls.add_constructor([param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')], visibility='public')
    5.17 +    cls.add_constructor([param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
    5.18      ## csma-channel.h: bool ns3::CsmaDeviceRec::IsActive() [member function]
    5.19 -    cls.add_method('IsActive', 'bool', [])
    5.20 +    cls.add_method('IsActive', 
    5.21 +                   'bool', 
    5.22 +                   [])
    5.23      return
    5.24  
    5.25  def register_Ns3Backoff_methods(root_module, cls):
    5.26 @@ -88,145 +90,306 @@
    5.27      ## backoff.h: ns3::Backoff::m_slotTime [variable]
    5.28      cls.add_instance_attribute('m_slotTime', 'ns3::Time', is_const=False)
    5.29      ## backoff.h: ns3::Backoff::Backoff() [constructor]
    5.30 -    cls.add_constructor([], visibility='public')
    5.31 +    cls.add_constructor([])
    5.32      ## backoff.h: ns3::Backoff::Backoff(ns3::Time slotTime, uint32_t minSlots, uint32_t maxSlots, uint32_t ceiling, uint32_t maxRetries) [constructor]
    5.33 -    cls.add_constructor([param('ns3::Time', 'slotTime'), param('uint32_t', 'minSlots'), param('uint32_t', 'maxSlots'), param('uint32_t', 'ceiling'), param('uint32_t', 'maxRetries')], visibility='public')
    5.34 +    cls.add_constructor([param('ns3::Time', 'slotTime'), param('uint32_t', 'minSlots'), param('uint32_t', 'maxSlots'), param('uint32_t', 'ceiling'), param('uint32_t', 'maxRetries')])
    5.35      ## backoff.h: ns3::Time ns3::Backoff::GetBackoffTime() [member function]
    5.36 -    cls.add_method('GetBackoffTime', 'ns3::Time', [])
    5.37 +    cls.add_method('GetBackoffTime', 
    5.38 +                   'ns3::Time', 
    5.39 +                   [])
    5.40      ## backoff.h: void ns3::Backoff::ResetBackoffTime() [member function]
    5.41 -    cls.add_method('ResetBackoffTime', 'void', [])
    5.42 +    cls.add_method('ResetBackoffTime', 
    5.43 +                   'void', 
    5.44 +                   [])
    5.45      ## backoff.h: bool ns3::Backoff::MaxRetriesReached() [member function]
    5.46 -    cls.add_method('MaxRetriesReached', 'bool', [])
    5.47 +    cls.add_method('MaxRetriesReached', 
    5.48 +                   'bool', 
    5.49 +                   [])
    5.50      ## backoff.h: void ns3::Backoff::IncrNumRetries() [member function]
    5.51 -    cls.add_method('IncrNumRetries', 'void', [])
    5.52 +    cls.add_method('IncrNumRetries', 
    5.53 +                   'void', 
    5.54 +                   [])
    5.55      return
    5.56  
    5.57  def register_Ns3CsmaChannel_methods(root_module, cls):
    5.58      ## csma-channel.h: static ns3::TypeId ns3::CsmaChannel::GetTypeId() [member function]
    5.59 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
    5.60 +    cls.add_method('GetTypeId', 
    5.61 +                   'ns3::TypeId', 
    5.62 +                   [], 
    5.63 +                   is_static=True)
    5.64      ## csma-channel.h: ns3::CsmaChannel::CsmaChannel() [constructor]
    5.65 -    cls.add_constructor([], visibility='public')
    5.66 +    cls.add_constructor([])
    5.67      ## csma-channel.h: int32_t ns3::CsmaChannel::Attach(ns3::Ptr<ns3::CsmaNetDevice> device) [member function]
    5.68 -    cls.add_method('Attach', 'int32_t', [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
    5.69 +    cls.add_method('Attach', 
    5.70 +                   'int32_t', 
    5.71 +                   [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
    5.72      ## csma-channel.h: bool ns3::CsmaChannel::Detach(ns3::Ptr<ns3::CsmaNetDevice> device) [member function]
    5.73 -    cls.add_method('Detach', 'bool', [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
    5.74 +    cls.add_method('Detach', 
    5.75 +                   'bool', 
    5.76 +                   [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
    5.77      ## csma-channel.h: bool ns3::CsmaChannel::Detach(uint32_t deviceId) [member function]
    5.78 -    cls.add_method('Detach', 'bool', [param('uint32_t', 'deviceId')])
    5.79 +    cls.add_method('Detach', 
    5.80 +                   'bool', 
    5.81 +                   [param('uint32_t', 'deviceId')])
    5.82      ## csma-channel.h: bool ns3::CsmaChannel::Reattach(uint32_t deviceId) [member function]
    5.83 -    cls.add_method('Reattach', 'bool', [param('uint32_t', 'deviceId')])
    5.84 +    cls.add_method('Reattach', 
    5.85 +                   'bool', 
    5.86 +                   [param('uint32_t', 'deviceId')])
    5.87      ## csma-channel.h: bool ns3::CsmaChannel::Reattach(ns3::Ptr<ns3::CsmaNetDevice> device) [member function]
    5.88 -    cls.add_method('Reattach', 'bool', [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
    5.89 +    cls.add_method('Reattach', 
    5.90 +                   'bool', 
    5.91 +                   [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
    5.92      ## csma-channel.h: bool ns3::CsmaChannel::TransmitStart(ns3::Ptr<ns3::Packet> p, uint32_t srcId) [member function]
    5.93 -    cls.add_method('TransmitStart', 'bool', [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint32_t', 'srcId')])
    5.94 +    cls.add_method('TransmitStart', 
    5.95 +                   'bool', 
    5.96 +                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint32_t', 'srcId')])
    5.97      ## csma-channel.h: bool ns3::CsmaChannel::TransmitEnd() [member function]
    5.98 -    cls.add_method('TransmitEnd', 'bool', [])
    5.99 +    cls.add_method('TransmitEnd', 
   5.100 +                   'bool', 
   5.101 +                   [])
   5.102      ## csma-channel.h: void ns3::CsmaChannel::PropagationCompleteEvent() [member function]
   5.103 -    cls.add_method('PropagationCompleteEvent', 'void', [])
   5.104 +    cls.add_method('PropagationCompleteEvent', 
   5.105 +                   'void', 
   5.106 +                   [])
   5.107      ## csma-channel.h: int32_t ns3::CsmaChannel::GetDeviceNum(ns3::Ptr<ns3::CsmaNetDevice> device) [member function]
   5.108 -    cls.add_method('GetDeviceNum', 'int32_t', [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
   5.109 +    cls.add_method('GetDeviceNum', 
   5.110 +                   'int32_t', 
   5.111 +                   [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')])
   5.112      ## csma-channel.h: ns3::WireState ns3::CsmaChannel::GetState() [member function]
   5.113 -    cls.add_method('GetState', 'ns3::WireState', [])
   5.114 +    cls.add_method('GetState', 
   5.115 +                   'ns3::WireState', 
   5.116 +                   [])
   5.117      ## csma-channel.h: bool ns3::CsmaChannel::IsBusy() [member function]
   5.118 -    cls.add_method('IsBusy', 'bool', [])
   5.119 +    cls.add_method('IsBusy', 
   5.120 +                   'bool', 
   5.121 +                   [])
   5.122      ## csma-channel.h: bool ns3::CsmaChannel::IsActive(uint32_t deviceId) [member function]
   5.123 -    cls.add_method('IsActive', 'bool', [param('uint32_t', 'deviceId')])
   5.124 +    cls.add_method('IsActive', 
   5.125 +                   'bool', 
   5.126 +                   [param('uint32_t', 'deviceId')])
   5.127      ## csma-channel.h: uint32_t ns3::CsmaChannel::GetNumActDevices() [member function]
   5.128 -    cls.add_method('GetNumActDevices', 'uint32_t', [])
   5.129 +    cls.add_method('GetNumActDevices', 
   5.130 +                   'uint32_t', 
   5.131 +                   [])
   5.132      ## csma-channel.h: uint32_t ns3::CsmaChannel::GetNDevices() const [member function]
   5.133 -    cls.add_method('GetNDevices', 'uint32_t', [], is_const=True, is_virtual=True)
   5.134 +    cls.add_method('GetNDevices', 
   5.135 +                   'uint32_t', 
   5.136 +                   [], 
   5.137 +                   is_const=True, is_virtual=True)
   5.138      ## csma-channel.h: ns3::Ptr<ns3::NetDevice> ns3::CsmaChannel::GetDevice(uint32_t i) const [member function]
   5.139 -    cls.add_method('GetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_const=True, is_virtual=True)
   5.140 +    cls.add_method('GetDevice', 
   5.141 +                   'ns3::Ptr< ns3::NetDevice >', 
   5.142 +                   [param('uint32_t', 'i')], 
   5.143 +                   is_const=True, is_virtual=True)
   5.144      ## csma-channel.h: ns3::Ptr<ns3::CsmaNetDevice> ns3::CsmaChannel::GetCsmaDevice(uint32_t i) const [member function]
   5.145 -    cls.add_method('GetCsmaDevice', 'ns3::Ptr< ns3::CsmaNetDevice >', [param('uint32_t', 'i')], is_const=True)
   5.146 +    cls.add_method('GetCsmaDevice', 
   5.147 +                   'ns3::Ptr< ns3::CsmaNetDevice >', 
   5.148 +                   [param('uint32_t', 'i')], 
   5.149 +                   is_const=True)
   5.150      ## csma-channel.h: ns3::DataRate ns3::CsmaChannel::GetDataRate() [member function]
   5.151 -    cls.add_method('GetDataRate', 'ns3::DataRate', [], is_virtual=True)
   5.152 +    cls.add_method('GetDataRate', 
   5.153 +                   'ns3::DataRate', 
   5.154 +                   [], 
   5.155 +                   is_virtual=True)
   5.156      ## csma-channel.h: ns3::Time ns3::CsmaChannel::GetDelay() [member function]
   5.157 -    cls.add_method('GetDelay', 'ns3::Time', [], is_virtual=True)
   5.158 +    cls.add_method('GetDelay', 
   5.159 +                   'ns3::Time', 
   5.160 +                   [], 
   5.161 +                   is_virtual=True)
   5.162      return
   5.163  
   5.164  def register_Ns3CsmaNetDevice_methods(root_module, cls):
   5.165      ## csma-net-device.h: static ns3::TypeId ns3::CsmaNetDevice::GetTypeId() [member function]
   5.166 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   5.167 +    cls.add_method('GetTypeId', 
   5.168 +                   'ns3::TypeId', 
   5.169 +                   [], 
   5.170 +                   is_static=True)
   5.171      ## csma-net-device.h: ns3::CsmaNetDevice::CsmaNetDevice() [constructor]
   5.172 -    cls.add_constructor([], visibility='public')
   5.173 +    cls.add_constructor([])
   5.174      ## csma-net-device.h: void ns3::CsmaNetDevice::SetInterframeGap(ns3::Time t) [member function]
   5.175 -    cls.add_method('SetInterframeGap', 'void', [param('ns3::Time', 't')])
   5.176 +    cls.add_method('SetInterframeGap', 
   5.177 +                   'void', 
   5.178 +                   [param('ns3::Time', 't')])
   5.179      ## csma-net-device.h: void ns3::CsmaNetDevice::SetBackoffParams(ns3::Time slotTime, uint32_t minSlots, uint32_t maxSlots, uint32_t maxRetries, uint32_t ceiling) [member function]
   5.180 -    cls.add_method('SetBackoffParams', 'void', [param('ns3::Time', 'slotTime'), param('uint32_t', 'minSlots'), param('uint32_t', 'maxSlots'), param('uint32_t', 'maxRetries'), param('uint32_t', 'ceiling')])
   5.181 +    cls.add_method('SetBackoffParams', 
   5.182 +                   'void', 
   5.183 +                   [param('ns3::Time', 'slotTime'), param('uint32_t', 'minSlots'), param('uint32_t', 'maxSlots'), param('uint32_t', 'maxRetries'), param('uint32_t', 'ceiling')])
   5.184      ## csma-net-device.h: bool ns3::CsmaNetDevice::Attach(ns3::Ptr<ns3::CsmaChannel> ch) [member function]
   5.185 -    cls.add_method('Attach', 'bool', [param('ns3::Ptr< ns3::CsmaChannel >', 'ch')])
   5.186 +    cls.add_method('Attach', 
   5.187 +                   'bool', 
   5.188 +                   [param('ns3::Ptr< ns3::CsmaChannel >', 'ch')])
   5.189      ## csma-net-device.h: void ns3::CsmaNetDevice::SetQueue(ns3::Ptr<ns3::Queue> queue) [member function]
   5.190 -    cls.add_method('SetQueue', 'void', [param('ns3::Ptr< ns3::Queue >', 'queue')])
   5.191 +    cls.add_method('SetQueue', 
   5.192 +                   'void', 
   5.193 +                   [param('ns3::Ptr< ns3::Queue >', 'queue')])
   5.194      ## csma-net-device.h: void ns3::CsmaNetDevice::SetReceiveErrorModel(ns3::Ptr<ns3::ErrorModel> em) [member function]
   5.195 -    cls.add_method('SetReceiveErrorModel', 'void', [param('ns3::Ptr< ns3::ErrorModel >', 'em')])
   5.196 +    cls.add_method('SetReceiveErrorModel', 
   5.197 +                   'void', 
   5.198 +                   [param('ns3::Ptr< ns3::ErrorModel >', 'em')])
   5.199      ## csma-net-device.h: void ns3::CsmaNetDevice::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ptr<ns3::CsmaNetDevice> sender) [member function]
   5.200 -    cls.add_method('Receive', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ptr< ns3::CsmaNetDevice >', 'sender')])
   5.201 +    cls.add_method('Receive', 
   5.202 +                   'void', 
   5.203 +                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ptr< ns3::CsmaNetDevice >', 'sender')])
   5.204      ## csma-net-device.h: bool ns3::CsmaNetDevice::IsSendEnabled() [member function]
   5.205 -    cls.add_method('IsSendEnabled', 'bool', [])
   5.206 +    cls.add_method('IsSendEnabled', 
   5.207 +                   'bool', 
   5.208 +                   [])
   5.209      ## csma-net-device.h: void ns3::CsmaNetDevice::SetSendEnable(bool enable) [member function]
   5.210 -    cls.add_method('SetSendEnable', 'void', [param('bool', 'enable')])
   5.211 +    cls.add_method('SetSendEnable', 
   5.212 +                   'void', 
   5.213 +                   [param('bool', 'enable')])
   5.214      ## csma-net-device.h: bool ns3::CsmaNetDevice::IsReceiveEnabled() [member function]
   5.215 -    cls.add_method('IsReceiveEnabled', 'bool', [])
   5.216 +    cls.add_method('IsReceiveEnabled', 
   5.217 +                   'bool', 
   5.218 +                   [])
   5.219      ## csma-net-device.h: void ns3::CsmaNetDevice::SetReceiveEnable(bool enable) [member function]
   5.220 -    cls.add_method('SetReceiveEnable', 'void', [param('bool', 'enable')])
   5.221 +    cls.add_method('SetReceiveEnable', 
   5.222 +                   'void', 
   5.223 +                   [param('bool', 'enable')])
   5.224      ## csma-net-device.h: void ns3::CsmaNetDevice::SetAddress(ns3::Mac48Address addr) [member function]
   5.225 -    cls.add_method('SetAddress', 'void', [param('ns3::Mac48Address', 'addr')])
   5.226 +    cls.add_method('SetAddress', 
   5.227 +                   'void', 
   5.228 +                   [param('ns3::Mac48Address', 'addr')])
   5.229      ## csma-net-device.h: void ns3::CsmaNetDevice::SetName(std::string const name) [member function]
   5.230 -    cls.add_method('SetName', 'void', [param('std::string', 'name', is_const=True)], is_virtual=True)
   5.231 +    cls.add_method('SetName', 
   5.232 +                   'void', 
   5.233 +                   [param('std::string', 'name', is_const=True)], 
   5.234 +                   is_virtual=True)
   5.235      ## csma-net-device.h: std::string ns3::CsmaNetDevice::GetName() const [member function]
   5.236 -    cls.add_method('GetName', 'std::string', [], is_const=True, is_virtual=True)
   5.237 +    cls.add_method('GetName', 
   5.238 +                   'std::string', 
   5.239 +                   [], 
   5.240 +                   is_const=True, is_virtual=True)
   5.241      ## csma-net-device.h: void ns3::CsmaNetDevice::SetIfIndex(uint32_t const index) [member function]
   5.242 -    cls.add_method('SetIfIndex', 'void', [param('uint32_t', 'index', is_const=True)], is_virtual=True)
   5.243 +    cls.add_method('SetIfIndex', 
   5.244 +                   'void', 
   5.245 +                   [param('uint32_t', 'index', is_const=True)], 
   5.246 +                   is_virtual=True)
   5.247      ## csma-net-device.h: uint32_t ns3::CsmaNetDevice::GetIfIndex() const [member function]
   5.248 -    cls.add_method('GetIfIndex', 'uint32_t', [], is_const=True, is_virtual=True)
   5.249 +    cls.add_method('GetIfIndex', 
   5.250 +                   'uint32_t', 
   5.251 +                   [], 
   5.252 +                   is_const=True, is_virtual=True)
   5.253      ## csma-net-device.h: ns3::Ptr<ns3::Channel> ns3::CsmaNetDevice::GetChannel() const [member function]
   5.254 -    cls.add_method('GetChannel', 'ns3::Ptr< ns3::Channel >', [], is_const=True, is_virtual=True)
   5.255 +    cls.add_method('GetChannel', 
   5.256 +                   'ns3::Ptr< ns3::Channel >', 
   5.257 +                   [], 
   5.258 +                   is_const=True, is_virtual=True)
   5.259      ## csma-net-device.h: ns3::Address ns3::CsmaNetDevice::GetAddress() const [member function]
   5.260 -    cls.add_method('GetAddress', 'ns3::Address', [], is_const=True, is_virtual=True)
   5.261 +    cls.add_method('GetAddress', 
   5.262 +                   'ns3::Address', 
   5.263 +                   [], 
   5.264 +                   is_const=True, is_virtual=True)
   5.265      ## csma-net-device.h: bool ns3::CsmaNetDevice::SetMtu(uint16_t const mtu) [member function]
   5.266 -    cls.add_method('SetMtu', 'bool', [param('uint16_t', 'mtu', is_const=True)], is_virtual=True)
   5.267 +    cls.add_method('SetMtu', 
   5.268 +                   'bool', 
   5.269 +                   [param('uint16_t', 'mtu', is_const=True)], 
   5.270 +                   is_virtual=True)
   5.271      ## csma-net-device.h: uint16_t ns3::CsmaNetDevice::GetMtu() const [member function]
   5.272 -    cls.add_method('GetMtu', 'uint16_t', [], is_const=True, is_virtual=True)
   5.273 +    cls.add_method('GetMtu', 
   5.274 +                   'uint16_t', 
   5.275 +                   [], 
   5.276 +                   is_const=True, is_virtual=True)
   5.277      ## csma-net-device.h: bool ns3::CsmaNetDevice::IsLinkUp() const [member function]
   5.278 -    cls.add_method('IsLinkUp', 'bool', [], is_const=True, is_virtual=True)
   5.279 +    cls.add_method('IsLinkUp', 
   5.280 +                   'bool', 
   5.281 +                   [], 
   5.282 +                   is_const=True, is_virtual=True)
   5.283      ## csma-net-device.h: void ns3::CsmaNetDevice::SetLinkChangeCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
   5.284 -    cls.add_method('SetLinkChangeCallback', 'void', [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], is_virtual=True)
   5.285 +    cls.add_method('SetLinkChangeCallback', 
   5.286 +                   'void', 
   5.287 +                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
   5.288 +                   is_virtual=True)
   5.289      ## csma-net-device.h: bool ns3::CsmaNetDevice::IsBroadcast() const [member function]
   5.290 -    cls.add_method('IsBroadcast', 'bool', [], is_const=True, is_virtual=True)
   5.291 +    cls.add_method('IsBroadcast', 
   5.292 +                   'bool', 
   5.293 +                   [], 
   5.294 +                   is_const=True, is_virtual=True)
   5.295      ## csma-net-device.h: ns3::Address ns3::CsmaNetDevice::GetBroadcast() const [member function]
   5.296 -    cls.add_method('GetBroadcast', 'ns3::Address', [], is_const=True, is_virtual=True)
   5.297 +    cls.add_method('GetBroadcast', 
   5.298 +                   'ns3::Address', 
   5.299 +                   [], 
   5.300 +                   is_const=True, is_virtual=True)
   5.301      ## csma-net-device.h: bool ns3::CsmaNetDevice::IsMulticast() const [member function]
   5.302 -    cls.add_method('IsMulticast', 'bool', [], is_const=True, is_virtual=True)
   5.303 +    cls.add_method('IsMulticast', 
   5.304 +                   'bool', 
   5.305 +                   [], 
   5.306 +                   is_const=True, is_virtual=True)
   5.307      ## csma-net-device.h: ns3::Address ns3::CsmaNetDevice::GetMulticast() const [member function]
   5.308 -    cls.add_method('GetMulticast', 'ns3::Address', [], is_const=True, is_virtual=True)
   5.309 +    cls.add_method('GetMulticast', 
   5.310 +                   'ns3::Address', 
   5.311 +                   [], 
   5.312 +                   is_const=True, is_virtual=True)
   5.313      ## csma-net-device.h: ns3::Address ns3::CsmaNetDevice::MakeMulticastAddress(ns3::Ipv4Address multicastGroup) const [member function]
   5.314 -    cls.add_method('MakeMulticastAddress', 'ns3::Address', [param('ns3::Ipv4Address', 'multicastGroup')], is_const=True, is_virtual=True)
   5.315 +    cls.add_method('MakeMulticastAddress', 
   5.316 +                   'ns3::Address', 
   5.317 +                   [param('ns3::Ipv4Address', 'multicastGroup')], 
   5.318 +                   is_const=True, is_virtual=True)
   5.319      ## csma-net-device.h: bool ns3::CsmaNetDevice::IsPointToPoint() const [member function]
   5.320 -    cls.add_method('IsPointToPoint', 'bool', [], is_const=True, is_virtual=True)
   5.321 +    cls.add_method('IsPointToPoint', 
   5.322 +                   'bool', 
   5.323 +                   [], 
   5.324 +                   is_const=True, is_virtual=True)
   5.325      ## csma-net-device.h: bool ns3::CsmaNetDevice::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
   5.326 -    cls.add_method('Send', 'bool', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True)
   5.327 +    cls.add_method('Send', 
   5.328 +                   'bool', 
   5.329 +                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], 
   5.330 +                   is_virtual=True)
   5.331      ## csma-net-device.h: bool ns3::CsmaNetDevice::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
   5.332 -    cls.add_method('SendFrom', 'bool', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True)
   5.333 +    cls.add_method('SendFrom', 
   5.334 +                   'bool', 
   5.335 +                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], 
   5.336 +                   is_virtual=True)
   5.337      ## csma-net-device.h: ns3::Ptr<ns3::Node> ns3::CsmaNetDevice::GetNode() const [member function]
   5.338 -    cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True)
   5.339 +    cls.add_method('GetNode', 
   5.340 +                   'ns3::Ptr< ns3::Node >', 
   5.341 +                   [], 
   5.342 +                   is_const=True, is_virtual=True)
   5.343      ## csma-net-device.h: void ns3::CsmaNetDevice::SetNode(ns3::Ptr<ns3::Node> node) [member function]
   5.344 -    cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_virtual=True)
   5.345 +    cls.add_method('SetNode', 
   5.346 +                   'void', 
   5.347 +                   [param('ns3::Ptr< ns3::Node >', 'node')], 
   5.348 +                   is_virtual=True)
   5.349      ## csma-net-device.h: bool ns3::CsmaNetDevice::NeedsArp() const [member function]
   5.350 -    cls.add_method('NeedsArp', 'bool', [], is_const=True, is_virtual=True)
   5.351 +    cls.add_method('NeedsArp', 
   5.352 +                   'bool', 
   5.353 +                   [], 
   5.354 +                   is_const=True, is_virtual=True)
   5.355      ## csma-net-device.h: void ns3::CsmaNetDevice::SetReceiveCallback(ns3::Callback<bool, ns3::Ptr<ns3::NetDevice>, ns3::Ptr<ns3::Packet>, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> cb) [member function]
   5.356 -    cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], is_virtual=True)
   5.357 +    cls.add_method('SetReceiveCallback', 
   5.358 +                   'void', 
   5.359 +                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], 
   5.360 +                   is_virtual=True)
   5.361      ## csma-net-device.h: void ns3::CsmaNetDevice::SetPromiscReceiveCallback(ns3::Callback<bool, ns3::Ptr<ns3::NetDevice>, ns3::Ptr<ns3::Packet>, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function]
   5.362 -    cls.add_method('SetPromiscReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], is_virtual=True)
   5.363 +    cls.add_method('SetPromiscReceiveCallback', 
   5.364 +                   'void', 
   5.365 +                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], 
   5.366 +                   is_virtual=True)
   5.367      ## csma-net-device.h: bool ns3::CsmaNetDevice::SupportsPromiscuous() const [member function]
   5.368 -    cls.add_method('SupportsPromiscuous', 'bool', [], is_const=True, is_virtual=True)
   5.369 +    cls.add_method('SupportsPromiscuous', 
   5.370 +                   'bool', 
   5.371 +                   [], 
   5.372 +                   is_const=True, is_virtual=True)
   5.373      ## csma-net-device.h: void ns3::CsmaNetDevice::DoDispose() [member function]
   5.374 -    cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True)
   5.375 +    cls.add_method('DoDispose', 
   5.376 +                   'void', 
   5.377 +                   [], 
   5.378 +                   visibility='protected', is_virtual=True)
   5.379      ## csma-net-device.h: ns3::Ptr<ns3::Queue> ns3::CsmaNetDevice::GetQueue() const [member function]
   5.380 -    cls.add_method('GetQueue', 'ns3::Ptr< ns3::Queue >', [], is_const=True, visibility='protected')
   5.381 +    cls.add_method('GetQueue', 
   5.382 +                   'ns3::Ptr< ns3::Queue >', 
   5.383 +                   [], 
   5.384 +                   is_const=True, visibility='protected')
   5.385      ## csma-net-device.h: void ns3::CsmaNetDevice::AddHeader(ns3::Ptr<ns3::Packet> p, ns3::Mac48Address source, ns3::Mac48Address dest, uint16_t protocolNumber) [member function]
   5.386 -    cls.add_method('AddHeader', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Mac48Address', 'source'), param('ns3::Mac48Address', 'dest'), param('uint16_t', 'protocolNumber')], visibility='protected')
   5.387 +    cls.add_method('AddHeader', 
   5.388 +                   'void', 
   5.389 +                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Mac48Address', 'source'), param('ns3::Mac48Address', 'dest'), param('uint16_t', 'protocolNumber')], 
   5.390 +                   visibility='protected')
   5.391      ## csma-net-device.h: bool ns3::CsmaNetDevice::ProcessHeader(ns3::Ptr<ns3::Packet> p, uint16_t & param) [member function]
   5.392 -    cls.add_method('ProcessHeader', 'bool', [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t&', 'param')], visibility='protected')
   5.393 +    cls.add_method('ProcessHeader', 
   5.394 +                   'bool', 
   5.395 +                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t&', 'param')], 
   5.396 +                   visibility='protected')
   5.397      return
   5.398  
   5.399  def register_functions(root_module):
     6.1 --- a/bindings/python/ns3_module_global_routing.py	Mon Jul 21 11:43:05 2008 +0100
     6.2 +++ b/bindings/python/ns3_module_global_routing.py	Mon Jul 21 15:30:15 2008 +0100
     6.3 @@ -1,4 +1,4 @@
     6.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     6.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     6.6  
     6.7  def register_types(module):
     6.8      root_module = module.get_root()
     6.9 @@ -67,99 +67,193 @@
    6.10  
    6.11  def register_Ns3GlobalRouteManager_methods(root_module, cls):
    6.12      ## global-route-manager.h: static void ns3::GlobalRouteManager::PopulateRoutingTables() [member function]
    6.13 -    cls.add_method('PopulateRoutingTables', 'void', [], is_static=True)
    6.14 +    cls.add_method('PopulateRoutingTables', 
    6.15 +                   'void', 
    6.16 +                   [], 
    6.17 +                   is_static=True)
    6.18      ## global-route-manager.h: static uint32_t ns3::GlobalRouteManager::AllocateRouterId() [member function]
    6.19 -    cls.add_method('AllocateRouterId', 'uint32_t', [], is_static=True)
    6.20 +    cls.add_method('AllocateRouterId', 
    6.21 +                   'uint32_t', 
    6.22 +                   [], 
    6.23 +                   is_static=True)
    6.24      return
    6.25  
    6.26  def register_Ns3GlobalRoutingLSA_methods(root_module, cls):
    6.27      ## global-router-interface.h: ns3::GlobalRoutingLSA::GlobalRoutingLSA() [constructor]
    6.28 -    cls.add_constructor([], visibility='public')
    6.29 +    cls.add_constructor([])
    6.30      ## global-router-interface.h: ns3::GlobalRoutingLSA::GlobalRoutingLSA(ns3::GlobalRoutingLSA::SPFStatus status, ns3::Ipv4Address linkStateId, ns3::Ipv4Address advertisingRtr) [constructor]
    6.31 -    cls.add_constructor([param('ns3::GlobalRoutingLSA::SPFStatus', 'status'), param('ns3::Ipv4Address', 'linkStateId'), param('ns3::Ipv4Address', 'advertisingRtr')], visibility='public')
    6.32 +    cls.add_constructor([param('ns3::GlobalRoutingLSA::SPFStatus', 'status'), param('ns3::Ipv4Address', 'linkStateId'), param('ns3::Ipv4Address', 'advertisingRtr')])
    6.33      ## global-router-interface.h: ns3::GlobalRoutingLSA::GlobalRoutingLSA(ns3::GlobalRoutingLSA & lsa) [constructor]
    6.34 -    cls.add_constructor([param('ns3::GlobalRoutingLSA&', 'lsa')], visibility='public')
    6.35 +    cls.add_constructor([param('ns3::GlobalRoutingLSA&', 'lsa')])
    6.36      ## global-router-interface.h: uint32_t ns3::GlobalRoutingLSA::AddAttachedRouter(ns3::Ipv4Address addr) [member function]
    6.37 -    cls.add_method('AddAttachedRouter', 'uint32_t', [param('ns3::Ipv4Address', 'addr')])
    6.38 +    cls.add_method('AddAttachedRouter', 
    6.39 +                   'uint32_t', 
    6.40 +                   [param('ns3::Ipv4Address', 'addr')])
    6.41      ## global-router-interface.h: uint32_t ns3::GlobalRoutingLSA::AddLinkRecord(ns3::GlobalRoutingLinkRecord * lr) [member function]
    6.42 -    cls.add_method('AddLinkRecord', 'uint32_t', [param('ns3::GlobalRoutingLinkRecord *', 'lr')])
    6.43 +    cls.add_method('AddLinkRecord', 
    6.44 +                   'uint32_t', 
    6.45 +                   [param('ns3::GlobalRoutingLinkRecord *', 'lr')])
    6.46      ## global-router-interface.h: void ns3::GlobalRoutingLSA::ClearLinkRecords() [member function]
    6.47 -    cls.add_method('ClearLinkRecords', 'void', [])
    6.48 +    cls.add_method('ClearLinkRecords', 
    6.49 +                   'void', 
    6.50 +                   [])
    6.51      ## global-router-interface.h: void ns3::GlobalRoutingLSA::CopyLinkRecords(ns3::GlobalRoutingLSA const & lsa) [member function]
    6.52 -    cls.add_method('CopyLinkRecords', 'void', [param('ns3::GlobalRoutingLSA&', 'lsa', is_const=True)])
    6.53 +    cls.add_method('CopyLinkRecords', 
    6.54 +                   'void', 
    6.55 +                   [param('ns3::GlobalRoutingLSA&', 'lsa', is_const=True)])
    6.56      ## global-router-interface.h: ns3::Ipv4Address ns3::GlobalRoutingLSA::GetAdvertisingRouter() const [member function]
    6.57 -    cls.add_method('GetAdvertisingRouter', 'ns3::Ipv4Address', [], is_const=True)
    6.58 +    cls.add_method('GetAdvertisingRouter', 
    6.59 +                   'ns3::Ipv4Address', 
    6.60 +                   [], 
    6.61 +                   is_const=True)
    6.62      ## global-router-interface.h: ns3::Ipv4Address ns3::GlobalRoutingLSA::GetAttachedRouter(uint32_t n) const [member function]
    6.63 -    cls.add_method('GetAttachedRouter', 'ns3::Ipv4Address', [param('uint32_t', 'n')], is_const=True)
    6.64 +    cls.add_method('GetAttachedRouter', 
    6.65 +                   'ns3::Ipv4Address', 
    6.66 +                   [param('uint32_t', 'n')], 
    6.67 +                   is_const=True)
    6.68      ## global-router-interface.h: ns3::GlobalRoutingLSA::LSType ns3::GlobalRoutingLSA::GetLSType() const [member function]
    6.69 -    cls.add_method('GetLSType', 'ns3::GlobalRoutingLSA::LSType', [], is_const=True)
    6.70 +    cls.add_method('GetLSType', 
    6.71 +                   'ns3::GlobalRoutingLSA::LSType', 
    6.72 +                   [], 
    6.73 +                   is_const=True)
    6.74      ## global-router-interface.h: ns3::GlobalRoutingLinkRecord * ns3::GlobalRoutingLSA::GetLinkRecord(uint32_t n) const [member function]
    6.75 -    cls.add_method('GetLinkRecord', 'ns3::GlobalRoutingLinkRecord *', [param('uint32_t', 'n')], is_const=True)
    6.76 +    cls.add_method('GetLinkRecord', 
    6.77 +                   'ns3::GlobalRoutingLinkRecord *', 
    6.78 +                   [param('uint32_t', 'n')], 
    6.79 +                   is_const=True)
    6.80      ## global-router-interface.h: ns3::Ipv4Address ns3::GlobalRoutingLSA::GetLinkStateId() const [member function]
    6.81 -    cls.add_method('GetLinkStateId', 'ns3::Ipv4Address', [], is_const=True)
    6.82 +    cls.add_method('GetLinkStateId', 
    6.83 +                   'ns3::Ipv4Address', 
    6.84 +                   [], 
    6.85 +                   is_const=True)
    6.86      ## global-router-interface.h: uint32_t ns3::GlobalRoutingLSA::GetNAttachedRouters() const [member function]
    6.87 -    cls.add_method('GetNAttachedRouters', 'uint32_t', [], is_const=True)
    6.88 +    cls.add_method('GetNAttachedRouters', 
    6.89 +                   'uint32_t', 
    6.90 +                   [], 
    6.91 +                   is_const=True)
    6.92      ## global-router-interface.h: uint32_t ns3::GlobalRoutingLSA::GetNLinkRecords() const [member function]
    6.93 -    cls.add_method('GetNLinkRecords', 'uint32_t', [], is_const=True)
    6.94 +    cls.add_method('GetNLinkRecords', 
    6.95 +                   'uint32_t', 
    6.96 +                   [], 
    6.97 +                   is_const=True)
    6.98      ## global-router-interface.h: ns3::Ipv4Mask ns3::GlobalRoutingLSA::GetNetworkLSANetworkMask() const [member function]
    6.99 -    cls.add_method('GetNetworkLSANetworkMask', 'ns3::Ipv4Mask', [], is_const=True)
   6.100 +    cls.add_method('GetNetworkLSANetworkMask', 
   6.101 +                   'ns3::Ipv4Mask', 
   6.102 +                   [], 
   6.103 +                   is_const=True)
   6.104      ## global-router-interface.h: ns3::GlobalRoutingLSA::SPFStatus ns3::GlobalRoutingLSA::GetStatus() const [member function]
   6.105 -    cls.add_method('GetStatus', 'ns3::GlobalRoutingLSA::SPFStatus', [], is_const=True)
   6.106 +    cls.add_method('GetStatus', 
   6.107 +                   'ns3::GlobalRoutingLSA::SPFStatus', 
   6.108 +                   [], 
   6.109 +                   is_const=True)
   6.110      ## global-router-interface.h: bool ns3::GlobalRoutingLSA::IsEmpty() const [member function]
   6.111 -    cls.add_method('IsEmpty', 'bool', [], is_const=True)
   6.112 +    cls.add_method('IsEmpty', 
   6.113 +                   'bool', 
   6.114 +                   [], 
   6.115 +                   is_const=True)
   6.116      ## global-router-interface.h: void ns3::GlobalRoutingLSA::Print(std::ostream & os) const [member function]
   6.117 -    cls.add_method('Print', 'void', [param('std::ostream&', 'os')], is_const=True)
   6.118 +    cls.add_method('Print', 
   6.119 +                   'void', 
   6.120 +                   [param('std::ostream&', 'os')], 
   6.121 +                   is_const=True)
   6.122      ## global-router-interface.h: void ns3::GlobalRoutingLSA::SetAdvertisingRouter(ns3::Ipv4Address rtr) [member function]
   6.123 -    cls.add_method('SetAdvertisingRouter', 'void', [param('ns3::Ipv4Address', 'rtr')])
   6.124 +    cls.add_method('SetAdvertisingRouter', 
   6.125 +                   'void', 
   6.126 +                   [param('ns3::Ipv4Address', 'rtr')])
   6.127      ## global-router-interface.h: void ns3::GlobalRoutingLSA::SetLSType(ns3::GlobalRoutingLSA::LSType typ) [member function]
   6.128 -    cls.add_method('SetLSType', 'void', [param('ns3::GlobalRoutingLSA::LSType', 'typ')])
   6.129 +    cls.add_method('SetLSType', 
   6.130 +                   'void', 
   6.131 +                   [param('ns3::GlobalRoutingLSA::LSType', 'typ')])
   6.132      ## global-router-interface.h: void ns3::GlobalRoutingLSA::SetLinkStateId(ns3::Ipv4Address addr) [member function]
   6.133 -    cls.add_method('SetLinkStateId', 'void', [param('ns3::Ipv4Address', 'addr')])
   6.134 +    cls.add_method('SetLinkStateId', 
   6.135 +                   'void', 
   6.136 +                   [param('ns3::Ipv4Address', 'addr')])
   6.137      ## global-router-interface.h: void ns3::GlobalRoutingLSA::SetNetworkLSANetworkMask(ns3::Ipv4Mask mask) [member function]
   6.138 -    cls.add_method('SetNetworkLSANetworkMask', 'void', [param('ns3::Ipv4Mask', 'mask')])
   6.139 +    cls.add_method('SetNetworkLSANetworkMask', 
   6.140 +                   'void', 
   6.141 +                   [param('ns3::Ipv4Mask', 'mask')])
   6.142      ## global-router-interface.h: void ns3::GlobalRoutingLSA::SetStatus(ns3::GlobalRoutingLSA::SPFStatus status) [member function]
   6.143 -    cls.add_method('SetStatus', 'void', [param('ns3::GlobalRoutingLSA::SPFStatus', 'status')])
   6.144 +    cls.add_method('SetStatus', 
   6.145 +                   'void', 
   6.146 +                   [param('ns3::GlobalRoutingLSA::SPFStatus', 'status')])
   6.147      cls.add_output_stream_operator()
   6.148      return
   6.149  
   6.150  def register_Ns3GlobalRoutingLinkRecord_methods(root_module, cls):
   6.151      ## global-router-interface.h: ns3::GlobalRoutingLinkRecord::GlobalRoutingLinkRecord() [constructor]
   6.152 -    cls.add_constructor([], visibility='public')
   6.153 +    cls.add_constructor([])
   6.154      ## global-router-interface.h: ns3::GlobalRoutingLinkRecord::GlobalRoutingLinkRecord(ns3::GlobalRoutingLinkRecord::LinkType linkType, ns3::Ipv4Address linkId, ns3::Ipv4Address linkData, uint16_t metric) [constructor]
   6.155 -    cls.add_constructor([param('ns3::GlobalRoutingLinkRecord::LinkType', 'linkType'), param('ns3::Ipv4Address', 'linkId'), param('ns3::Ipv4Address', 'linkData'), param('uint16_t', 'metric')], visibility='public')
   6.156 +    cls.add_constructor([param('ns3::GlobalRoutingLinkRecord::LinkType', 'linkType'), param('ns3::Ipv4Address', 'linkId'), param('ns3::Ipv4Address', 'linkData'), param('uint16_t', 'metric')])
   6.157      ## global-router-interface.h: ns3::Ipv4Address ns3::GlobalRoutingLinkRecord::GetLinkId() const [member function]
   6.158 -    cls.add_method('GetLinkId', 'ns3::Ipv4Address', [], is_const=True)
   6.159 +    cls.add_method('GetLinkId', 
   6.160 +                   'ns3::Ipv4Address', 
   6.161 +                   [], 
   6.162 +                   is_const=True)
   6.163      ## global-router-interface.h: void ns3::GlobalRoutingLinkRecord::SetLinkId(ns3::Ipv4Address addr) [member function]
   6.164 -    cls.add_method('SetLinkId', 'void', [param('ns3::Ipv4Address', 'addr')])
   6.165 +    cls.add_method('SetLinkId', 
   6.166 +                   'void', 
   6.167 +                   [param('ns3::Ipv4Address', 'addr')])
   6.168      ## global-router-interface.h: ns3::Ipv4Address ns3::GlobalRoutingLinkRecord::GetLinkData() const [member function]
   6.169 -    cls.add_method('GetLinkData', 'ns3::Ipv4Address', [], is_const=True)
   6.170 +    cls.add_method('GetLinkData', 
   6.171 +                   'ns3::Ipv4Address', 
   6.172 +                   [], 
   6.173 +                   is_const=True)
   6.174      ## global-router-interface.h: void ns3::GlobalRoutingLinkRecord::SetLinkData(ns3::Ipv4Address addr) [member function]
   6.175 -    cls.add_method('SetLinkData', 'void', [param('ns3::Ipv4Address', 'addr')])
   6.176 +    cls.add_method('SetLinkData', 
   6.177 +                   'void', 
   6.178 +                   [param('ns3::Ipv4Address', 'addr')])
   6.179      ## global-router-interface.h: ns3::GlobalRoutingLinkRecord::LinkType ns3::GlobalRoutingLinkRecord::GetLinkType() const [member function]
   6.180 -    cls.add_method('GetLinkType', 'ns3::GlobalRoutingLinkRecord::LinkType', [], is_const=True)
   6.181 +    cls.add_method('GetLinkType', 
   6.182 +                   'ns3::GlobalRoutingLinkRecord::LinkType', 
   6.183 +                   [], 
   6.184 +                   is_const=True)
   6.185      ## global-router-interface.h: void ns3::GlobalRoutingLinkRecord::SetLinkType(ns3::GlobalRoutingLinkRecord::LinkType linkType) [member function]
   6.186 -    cls.add_method('SetLinkType', 'void', [param('ns3::GlobalRoutingLinkRecord::LinkType', 'linkType')])
   6.187 +    cls.add_method('SetLinkType', 
   6.188 +                   'void', 
   6.189 +                   [param('ns3::GlobalRoutingLinkRecord::LinkType', 'linkType')])
   6.190      ## global-router-interface.h: uint16_t ns3::GlobalRoutingLinkRecord::GetMetric() const [member function]
   6.191 -    cls.add_method('GetMetric', 'uint16_t', [], is_const=True)
   6.192 +    cls.add_method('GetMetric', 
   6.193 +                   'uint16_t', 
   6.194 +                   [], 
   6.195 +                   is_const=True)
   6.196      ## global-router-interface.h: void ns3::GlobalRoutingLinkRecord::SetMetric(uint16_t metric) [member function]
   6.197 -    cls.add_method('SetMetric', 'void', [param('uint16_t', 'metric')])
   6.198 +    cls.add_method('SetMetric', 
   6.199 +                   'void', 
   6.200 +                   [param('uint16_t', 'metric')])
   6.201      return
   6.202  
   6.203  def register_Ns3GlobalRouter_methods(root_module, cls):
   6.204      ## global-router-interface.h: static ns3::TypeId ns3::GlobalRouter::GetTypeId() [member function]
   6.205 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   6.206 +    cls.add_method('GetTypeId', 
   6.207 +                   'ns3::TypeId', 
   6.208 +                   [], 
   6.209 +                   is_static=True)
   6.210      ## global-router-interface.h: ns3::GlobalRouter::GlobalRouter() [constructor]
   6.211 -    cls.add_constructor([], visibility='public')
   6.212 +    cls.add_constructor([])
   6.213      ## global-router-interface.h: ns3::Ipv4Address ns3::GlobalRouter::GetRouterId() const [member function]
   6.214 -    cls.add_method('GetRouterId', 'ns3::Ipv4Address', [], is_const=True)
   6.215 +    cls.add_method('GetRouterId', 
   6.216 +                   'ns3::Ipv4Address', 
   6.217 +                   [], 
   6.218 +                   is_const=True)
   6.219      ## global-router-interface.h: uint32_t ns3::GlobalRouter::DiscoverLSAs() [member function]
   6.220 -    cls.add_method('DiscoverLSAs', 'uint32_t', [])
   6.221 +    cls.add_method('DiscoverLSAs', 
   6.222 +                   'uint32_t', 
   6.223 +                   [])
   6.224      ## global-router-interface.h: uint32_t ns3::GlobalRouter::GetNumLSAs() const [member function]
   6.225 -    cls.add_method('GetNumLSAs', 'uint32_t', [], is_const=True)
   6.226 +    cls.add_method('GetNumLSAs', 
   6.227 +                   'uint32_t', 
   6.228 +                   [], 
   6.229 +                   is_const=True)
   6.230      ## global-router-interface.h: bool ns3::GlobalRouter::GetLSA(uint32_t n, ns3::GlobalRoutingLSA & lsa) const [member function]
   6.231 -    cls.add_method('GetLSA', 'bool', [param('uint32_t', 'n'), param('ns3::GlobalRoutingLSA&', 'lsa')], is_const=True)
   6.232 +    cls.add_method('GetLSA', 
   6.233 +                   'bool', 
   6.234 +                   [param('uint32_t', 'n'), param('ns3::GlobalRoutingLSA&', 'lsa')], 
   6.235 +                   is_const=True)
   6.236      ## global-router-interface.h: void ns3::GlobalRouter::DoDispose() [member function]
   6.237 -    cls.add_method('DoDispose', 'void', [], visibility='private', is_virtual=True)
   6.238 +    cls.add_method('DoDispose', 
   6.239 +                   'void', 
   6.240 +                   [], 
   6.241 +                   visibility='private', is_virtual=True)
   6.242      return
   6.243  
   6.244  def register_functions(root_module):
     7.1 --- a/bindings/python/ns3_module_helper.py	Mon Jul 21 11:43:05 2008 +0100
     7.2 +++ b/bindings/python/ns3_module_helper.py	Mon Jul 21 15:30:15 2008 +0100
     7.3 @@ -1,4 +1,4 @@
     7.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     7.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     7.6  
     7.7  def register_types(module):
     7.8      root_module = module.get_root()
     7.9 @@ -103,296 +103,544 @@
    7.10  
    7.11  def register_Ns3MobilityHelper_methods(root_module, cls):
    7.12      ## mobility-helper.h: ns3::MobilityHelper::MobilityHelper() [constructor]
    7.13 -    cls.add_constructor([], visibility='public')
    7.14 +    cls.add_constructor([])
    7.15      ## mobility-helper.h: void ns3::MobilityHelper::SetPositionAllocator(ns3::Ptr<ns3::PositionAllocator> allocator) [member function]
    7.16 -    cls.add_method('SetPositionAllocator', 'void', [param('ns3::Ptr< ns3::PositionAllocator >', 'allocator')])
    7.17 +    cls.add_method('SetPositionAllocator', 
    7.18 +                   'void', 
    7.19 +                   [param('ns3::Ptr< ns3::PositionAllocator >', 'allocator')])
    7.20      ## mobility-helper.h: void ns3::MobilityHelper::SetPositionAllocator(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue(), std::string n8="", ns3::AttributeValue const & v8=ns3::EmptyAttributeValue(), std::string n9="", ns3::AttributeValue const & v9=ns3::EmptyAttributeValue()) [member function]
    7.21 -    cls.add_method('SetPositionAllocator', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n8', default_value='""'), param('ns3::AttributeValue&', 'v8', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n9', default_value='""'), param('ns3::AttributeValue&', 'v9', default_value='ns3::EmptyAttributeValue()', is_const=True)])
    7.22 +    cls.add_method('SetPositionAllocator', 
    7.23 +                   'void', 
    7.24 +                   [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n8', default_value='""'), param('ns3::AttributeValue&', 'v8', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n9', default_value='""'), param('ns3::AttributeValue&', 'v9', default_value='ns3::EmptyAttributeValue()', is_const=True)])
    7.25      ## mobility-helper.h: void ns3::MobilityHelper::SetMobilityModel(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue(), std::string n8="", ns3::AttributeValue const & v8=ns3::EmptyAttributeValue(), std::string n9="", ns3::AttributeValue const & v9=ns3::EmptyAttributeValue()) [member function]
    7.26 -    cls.add_method('SetMobilityModel', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n8', default_value='""'), param('ns3::AttributeValue&', 'v8', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n9', default_value='""'), param('ns3::AttributeValue&', 'v9', default_value='ns3::EmptyAttributeValue()', is_const=True)])
    7.27 +    cls.add_method('SetMobilityModel', 
    7.28 +                   'void', 
    7.29 +                   [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n8', default_value='""'), param('ns3::AttributeValue&', 'v8', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n9', default_value='""'), param('ns3::AttributeValue&', 'v9', default_value='ns3::EmptyAttributeValue()', is_const=True)])
    7.30      ## mobility-helper.h: void ns3::MobilityHelper::PushReferenceMobilityModel(ns3::Ptr<ns3::Object> reference) [member function]
    7.31 -    cls.add_method('PushReferenceMobilityModel', 'void', [param('ns3::Ptr< ns3::Object >', 'reference')])
    7.32 +    cls.add_method('PushReferenceMobilityModel', 
    7.33 +                   'void', 
    7.34 +                   [param('ns3::Ptr< ns3::Object >', 'reference')])
    7.35      ## mobility-helper.h: void ns3::MobilityHelper::PopReferenceMobilityModel() [member function]
    7.36 -    cls.add_method('PopReferenceMobilityModel', 'void', [])
    7.37 +    cls.add_method('PopReferenceMobilityModel', 
    7.38 +                   'void', 
    7.39 +                   [])
    7.40      ## mobility-helper.h: std::string ns3::MobilityHelper::GetMobilityModelType() const [member function]
    7.41 -    cls.add_method('GetMobilityModelType', 'std::string', [], is_const=True)
    7.42 +    cls.add_method('GetMobilityModelType', 
    7.43 +                   'std::string', 
    7.44 +                   [], 
    7.45 +                   is_const=True)
    7.46      ## mobility-helper.h: void ns3::MobilityHelper::Install(ns3::NodeContainer container) [member function]
    7.47 -    cls.add_method('Install', 'void', [param('ns3::NodeContainer', 'container')])
    7.48 +    cls.add_method('Install', 
    7.49 +                   'void', 
    7.50 +                   [param('ns3::NodeContainer', 'container')])
    7.51      ## mobility-helper.h: void ns3::MobilityHelper::InstallAll() [member function]
    7.52 -    cls.add_method('InstallAll', 'void', [])
    7.53 +    cls.add_method('InstallAll', 
    7.54 +                   'void', 
    7.55 +                   [])
    7.56      return
    7.57  
    7.58  def register_Ns3InternetStackHelper_methods(root_module, cls):
    7.59      ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::NodeContainer c) [member function]
    7.60 -    cls.add_method('Install', 'void', [param('ns3::NodeContainer', 'c')])
    7.61 +    cls.add_method('Install', 
    7.62 +                   'void', 
    7.63 +                   [param('ns3::NodeContainer', 'c')])
    7.64      ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnablePcapAll(std::string filename) [member function]
    7.65 -    cls.add_method('EnablePcapAll', 'void', [param('std::string', 'filename')], is_static=True)
    7.66 +    cls.add_method('EnablePcapAll', 
    7.67 +                   'void', 
    7.68 +                   [param('std::string', 'filename')], 
    7.69 +                   is_static=True)
    7.70      cls.add_constructor([])
    7.71      return
    7.72  
    7.73  def register_Ns3NodeContainer_methods(root_module, cls):
    7.74      ## node-container.h: ns3::NodeContainer::NodeContainer() [constructor]
    7.75 -    cls.add_constructor([], visibility='public')
    7.76 +    cls.add_constructor([])
    7.77      ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::Ptr<ns3::Node> node) [constructor]
    7.78 -    cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node')], visibility='public')
    7.79 +    cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node')])
    7.80      ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b) [constructor]
    7.81 -    cls.add_constructor([param('ns3::NodeContainer&', 'a', is_const=True), param('ns3::NodeContainer&', 'b', is_const=True)], visibility='public')
    7.82 +    cls.add_constructor([param('ns3::NodeContainer&', 'a', is_const=True), param('ns3::NodeContainer&', 'b', is_const=True)])
    7.83      ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c) [constructor]
    7.84 -    cls.add_constructor([param('ns3::NodeContainer&', 'a', is_const=True), param('ns3::NodeContainer&', 'b', is_const=True), param('ns3::NodeContainer&', 'c', is_const=True)], visibility='public')
    7.85 +    cls.add_constructor([param('ns3::NodeContainer&', 'a', is_const=True), param('ns3::NodeContainer&', 'b', is_const=True), param('ns3::NodeContainer&', 'c', is_const=True)])
    7.86      ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d) [constructor]
    7.87 -    cls.add_constructor([param('ns3::NodeContainer&', 'a', is_const=True), param('ns3::NodeContainer&', 'b', is_const=True), param('ns3::NodeContainer&', 'c', is_const=True), param('ns3::NodeContainer&', 'd', is_const=True)], visibility='public')
    7.88 +    cls.add_constructor([param('ns3::NodeContainer&', 'a', is_const=True), param('ns3::NodeContainer&', 'b', is_const=True), param('ns3::NodeContainer&', 'c', is_const=True), param('ns3::NodeContainer&', 'd', is_const=True)])
    7.89      ## node-container.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Node>*,std::vector<ns3::Ptr<ns3::Node>, std::allocator<ns3::Ptr<ns3::Node> > > > ns3::NodeContainer::Begin() const [member function]
    7.90 -    cls.add_method('Begin', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Node >, std::vector< ns3::Ptr< ns3::Node >, std::allocator< ns3::Ptr< ns3::Node > > > >', [], is_const=True)
    7.91 +    cls.add_method('Begin', 
    7.92 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Node >, std::vector< ns3::Ptr< ns3::Node >, std::allocator< ns3::Ptr< ns3::Node > > > >', 
    7.93 +                   [], 
    7.94 +                   is_const=True)
    7.95      ## node-container.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Node>*,std::vector<ns3::Ptr<ns3::Node>, std::allocator<ns3::Ptr<ns3::Node> > > > ns3::NodeContainer::End() const [member function]
    7.96 -    cls.add_method('End', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Node >, std::vector< ns3::Ptr< ns3::Node >, std::allocator< ns3::Ptr< ns3::Node > > > >', [], is_const=True)
    7.97 +    cls.add_method('End', 
    7.98 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Node >, std::vector< ns3::Ptr< ns3::Node >, std::allocator< ns3::Ptr< ns3::Node > > > >', 
    7.99 +                   [], 
   7.100 +                   is_const=True)
   7.101      ## node-container.h: uint32_t ns3::NodeContainer::GetN() const [member function]
   7.102 -    cls.add_method('GetN', 'uint32_t', [], is_const=True)
   7.103 +    cls.add_method('GetN', 
   7.104 +                   'uint32_t', 
   7.105 +                   [], 
   7.106 +                   is_const=True)
   7.107      ## node-container.h: ns3::Ptr<ns3::Node> ns3::NodeContainer::Get(uint32_t i) const [member function]
   7.108 -    cls.add_method('Get', 'ns3::Ptr< ns3::Node >', [param('uint32_t', 'i')], is_const=True)
   7.109 +    cls.add_method('Get', 
   7.110 +                   'ns3::Ptr< ns3::Node >', 
   7.111 +                   [param('uint32_t', 'i')], 
   7.112 +                   is_const=True)
   7.113      ## node-container.h: void ns3::NodeContainer::Create(uint32_t n) [member function]
   7.114 -    cls.add_method('Create', 'void', [param('uint32_t', 'n')])
   7.115 +    cls.add_method('Create', 
   7.116 +                   'void', 
   7.117 +                   [param('uint32_t', 'n')])
   7.118      ## node-container.h: void ns3::NodeContainer::Add(ns3::NodeContainer other) [member function]
   7.119 -    cls.add_method('Add', 'void', [param('ns3::NodeContainer', 'other')])
   7.120 +    cls.add_method('Add', 
   7.121 +                   'void', 
   7.122 +                   [param('ns3::NodeContainer', 'other')])
   7.123      ## node-container.h: void ns3::NodeContainer::Add(ns3::Ptr<ns3::Node> node) [member function]
   7.124 -    cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::Node >', 'node')])
   7.125 +    cls.add_method('Add', 
   7.126 +                   'void', 
   7.127 +                   [param('ns3::Ptr< ns3::Node >', 'node')])
   7.128      ## node-container.h: static ns3::NodeContainer ns3::NodeContainer::GetGlobal() [member function]
   7.129 -    cls.add_method('GetGlobal', 'ns3::NodeContainer', [], is_static=True)
   7.130 +    cls.add_method('GetGlobal', 
   7.131 +                   'ns3::NodeContainer', 
   7.132 +                   [], 
   7.133 +                   is_static=True)
   7.134      return
   7.135  
   7.136  def register_Ns3PointToPointHelper_methods(root_module, cls):
   7.137      ## point-to-point-helper.h: ns3::PointToPointHelper::PointToPointHelper() [constructor]
   7.138 -    cls.add_constructor([], visibility='public')
   7.139 +    cls.add_constructor([])
   7.140      ## point-to-point-helper.h: void ns3::PointToPointHelper::SetQueue(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue()) [member function]
   7.141 -    cls.add_method('SetQueue', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.142 +    cls.add_method('SetQueue', 
   7.143 +                   'void', 
   7.144 +                   [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.145      ## point-to-point-helper.h: void ns3::PointToPointHelper::SetDeviceAttribute(std::string name, ns3::AttributeValue const & value) [member function]
   7.146 -    cls.add_method('SetDeviceAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.147 +    cls.add_method('SetDeviceAttribute', 
   7.148 +                   'void', 
   7.149 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.150      ## point-to-point-helper.h: void ns3::PointToPointHelper::SetChannelAttribute(std::string name, ns3::AttributeValue const & value) [member function]
   7.151 -    cls.add_method('SetChannelAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.152 +    cls.add_method('SetChannelAttribute', 
   7.153 +                   'void', 
   7.154 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.155      ## point-to-point-helper.h: void ns3::PointToPointHelper::SetDeviceParameter(std::string name, ns3::AttributeValue const & value) [member function]
   7.156 -    cls.add_method('SetDeviceParameter', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.157 +    cls.add_method('SetDeviceParameter', 
   7.158 +                   'void', 
   7.159 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)], 
   7.160 +                   deprecated=True)
   7.161      ## point-to-point-helper.h: void ns3::PointToPointHelper::SetChannelParameter(std::string name, ns3::AttributeValue const & value) [member function]
   7.162 -    cls.add_method('SetChannelParameter', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.163 +    cls.add_method('SetChannelParameter', 
   7.164 +                   'void', 
   7.165 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)], 
   7.166 +                   deprecated=True)
   7.167      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid) [member function]
   7.168 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], is_static=True)
   7.169 +    cls.add_method('EnablePcap', 
   7.170 +                   'void', 
   7.171 +                   [param('std::string', 'filename'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], 
   7.172 +                   is_static=True)
   7.173      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnablePcap(std::string filename, ns3::NetDeviceContainer d) [member function]
   7.174 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('ns3::NetDeviceContainer', 'd')], is_static=True)
   7.175 +    cls.add_method('EnablePcap', 
   7.176 +                   'void', 
   7.177 +                   [param('std::string', 'filename'), param('ns3::NetDeviceContainer', 'd')], 
   7.178 +                   is_static=True)
   7.179      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnablePcap(std::string filename, ns3::NodeContainer n) [member function]
   7.180 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('ns3::NodeContainer', 'n')], is_static=True)
   7.181 +    cls.add_method('EnablePcap', 
   7.182 +                   'void', 
   7.183 +                   [param('std::string', 'filename'), param('ns3::NodeContainer', 'n')], 
   7.184 +                   is_static=True)
   7.185      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnablePcapAll(std::string filename) [member function]
   7.186 -    cls.add_method('EnablePcapAll', 'void', [param('std::string', 'filename')], is_static=True)
   7.187 +    cls.add_method('EnablePcapAll', 
   7.188 +                   'void', 
   7.189 +                   [param('std::string', 'filename')], 
   7.190 +                   is_static=True)
   7.191      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
   7.192 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], is_static=True)
   7.193 +    cls.add_method('EnableAscii', 
   7.194 +                   'void', 
   7.195 +                   [param('std::ostream&', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], 
   7.196 +                   is_static=True)
   7.197      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
   7.198 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('ns3::NetDeviceContainer', 'd')], is_static=True)
   7.199 +    cls.add_method('EnableAscii', 
   7.200 +                   'void', 
   7.201 +                   [param('std::ostream&', 'os'), param('ns3::NetDeviceContainer', 'd')], 
   7.202 +                   is_static=True)
   7.203      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
   7.204 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('ns3::NodeContainer', 'n')], is_static=True)
   7.205 +    cls.add_method('EnableAscii', 
   7.206 +                   'void', 
   7.207 +                   [param('std::ostream&', 'os'), param('ns3::NodeContainer', 'n')], 
   7.208 +                   is_static=True)
   7.209      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAsciiAll(std::ostream & os) [member function]
   7.210 -    cls.add_method('EnableAsciiAll', 'void', [param('std::ostream&', 'os')], is_static=True)
   7.211 +    cls.add_method('EnableAsciiAll', 
   7.212 +                   'void', 
   7.213 +                   [param('std::ostream&', 'os')], 
   7.214 +                   is_static=True)
   7.215      ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::NodeContainer c) [member function]
   7.216 -    cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::NodeContainer', 'c')])
   7.217 +    cls.add_method('Install', 
   7.218 +                   'ns3::NetDeviceContainer', 
   7.219 +                   [param('ns3::NodeContainer', 'c')])
   7.220      ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::Ptr<ns3::Node> a, ns3::Ptr<ns3::Node> b) [member function]
   7.221 -    cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::Ptr< ns3::Node >', 'a'), param('ns3::Ptr< ns3::Node >', 'b')])
   7.222 +    cls.add_method('Install', 
   7.223 +                   'ns3::NetDeviceContainer', 
   7.224 +                   [param('ns3::Ptr< ns3::Node >', 'a'), param('ns3::Ptr< ns3::Node >', 'b')])
   7.225      return
   7.226  
   7.227  def register_Ns3NetDeviceContainer_methods(root_module, cls):
   7.228      ## net-device-container.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::Begin() const [member function]
   7.229 -    cls.add_method('Begin', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::NetDevice >, std::vector< ns3::Ptr< ns3::NetDevice >, std::allocator< ns3::Ptr< ns3::NetDevice > > > >', [], is_const=True)
   7.230 +    cls.add_method('Begin', 
   7.231 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::NetDevice >, std::vector< ns3::Ptr< ns3::NetDevice >, std::allocator< ns3::Ptr< ns3::NetDevice > > > >', 
   7.232 +                   [], 
   7.233 +                   is_const=True)
   7.234      ## net-device-container.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::End() const [member function]
   7.235 -    cls.add_method('End', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::NetDevice >, std::vector< ns3::Ptr< ns3::NetDevice >, std::allocator< ns3::Ptr< ns3::NetDevice > > > >', [], is_const=True)
   7.236 +    cls.add_method('End', 
   7.237 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::NetDevice >, std::vector< ns3::Ptr< ns3::NetDevice >, std::allocator< ns3::Ptr< ns3::NetDevice > > > >', 
   7.238 +                   [], 
   7.239 +                   is_const=True)
   7.240      ## net-device-container.h: uint32_t ns3::NetDeviceContainer::GetN() const [member function]
   7.241 -    cls.add_method('GetN', 'uint32_t', [], is_const=True)
   7.242 +    cls.add_method('GetN', 
   7.243 +                   'uint32_t', 
   7.244 +                   [], 
   7.245 +                   is_const=True)
   7.246      ## net-device-container.h: ns3::Ptr<ns3::NetDevice> ns3::NetDeviceContainer::Get(uint32_t i) const [member function]
   7.247 -    cls.add_method('Get', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_const=True)
   7.248 +    cls.add_method('Get', 
   7.249 +                   'ns3::Ptr< ns3::NetDevice >', 
   7.250 +                   [param('uint32_t', 'i')], 
   7.251 +                   is_const=True)
   7.252      ## net-device-container.h: void ns3::NetDeviceContainer::Add(ns3::NetDeviceContainer other) [member function]
   7.253 -    cls.add_method('Add', 'void', [param('ns3::NetDeviceContainer', 'other')])
   7.254 +    cls.add_method('Add', 
   7.255 +                   'void', 
   7.256 +                   [param('ns3::NetDeviceContainer', 'other')])
   7.257      ## net-device-container.h: void ns3::NetDeviceContainer::Add(ns3::Ptr<ns3::NetDevice> device) [member function]
   7.258 -    cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'device')])
   7.259 +    cls.add_method('Add', 
   7.260 +                   'void', 
   7.261 +                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
   7.262      cls.add_constructor([])
   7.263      return
   7.264  
   7.265  def register_Ns3CsmaHelper_methods(root_module, cls):
   7.266      ## csma-helper.h: ns3::CsmaHelper::CsmaHelper() [constructor]
   7.267 -    cls.add_constructor([], visibility='public')
   7.268 +    cls.add_constructor([])
   7.269      ## csma-helper.h: void ns3::CsmaHelper::SetQueue(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue()) [member function]
   7.270 -    cls.add_method('SetQueue', 'void', [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.271 +    cls.add_method('SetQueue', 
   7.272 +                   'void', 
   7.273 +                   [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.274      ## csma-helper.h: void ns3::CsmaHelper::SetDeviceAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
   7.275 -    cls.add_method('SetDeviceAttribute', 'void', [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)])
   7.276 +    cls.add_method('SetDeviceAttribute', 
   7.277 +                   'void', 
   7.278 +                   [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)])
   7.279      ## csma-helper.h: void ns3::CsmaHelper::SetChannelAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
   7.280 -    cls.add_method('SetChannelAttribute', 'void', [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)])
   7.281 +    cls.add_method('SetChannelAttribute', 
   7.282 +                   'void', 
   7.283 +                   [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)])
   7.284      ## csma-helper.h: void ns3::CsmaHelper::SetDeviceParameter(std::string n1, ns3::AttributeValue const & v1) [member function]
   7.285 -    cls.add_method('SetDeviceParameter', 'void', [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)])
   7.286 +    cls.add_method('SetDeviceParameter', 
   7.287 +                   'void', 
   7.288 +                   [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)], 
   7.289 +                   deprecated=True)
   7.290      ## csma-helper.h: void ns3::CsmaHelper::SetChannelParameter(std::string n1, ns3::AttributeValue const & v1) [member function]
   7.291 -    cls.add_method('SetChannelParameter', 'void', [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)])
   7.292 +    cls.add_method('SetChannelParameter', 
   7.293 +                   'void', 
   7.294 +                   [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)], 
   7.295 +                   deprecated=True)
   7.296      ## csma-helper.h: static void ns3::CsmaHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid) [member function]
   7.297 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], is_static=True)
   7.298 +    cls.add_method('EnablePcap', 
   7.299 +                   'void', 
   7.300 +                   [param('std::string', 'filename'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], 
   7.301 +                   is_static=True)
   7.302      ## csma-helper.h: static void ns3::CsmaHelper::EnablePcap(std::string filename, ns3::NetDeviceContainer d) [member function]
   7.303 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('ns3::NetDeviceContainer', 'd')], is_static=True)
   7.304 +    cls.add_method('EnablePcap', 
   7.305 +                   'void', 
   7.306 +                   [param('std::string', 'filename'), param('ns3::NetDeviceContainer', 'd')], 
   7.307 +                   is_static=True)
   7.308      ## csma-helper.h: static void ns3::CsmaHelper::EnablePcap(std::string filename, ns3::NodeContainer n) [member function]
   7.309 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('ns3::NodeContainer', 'n')], is_static=True)
   7.310 +    cls.add_method('EnablePcap', 
   7.311 +                   'void', 
   7.312 +                   [param('std::string', 'filename'), param('ns3::NodeContainer', 'n')], 
   7.313 +                   is_static=True)
   7.314      ## csma-helper.h: static void ns3::CsmaHelper::EnablePcapAll(std::string filename) [member function]
   7.315 -    cls.add_method('EnablePcapAll', 'void', [param('std::string', 'filename')], is_static=True)
   7.316 +    cls.add_method('EnablePcapAll', 
   7.317 +                   'void', 
   7.318 +                   [param('std::string', 'filename')], 
   7.319 +                   is_static=True)
   7.320      ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
   7.321 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], is_static=True)
   7.322 +    cls.add_method('EnableAscii', 
   7.323 +                   'void', 
   7.324 +                   [param('std::ostream&', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], 
   7.325 +                   is_static=True)
   7.326      ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
   7.327 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('ns3::NetDeviceContainer', 'd')], is_static=True)
   7.328 +    cls.add_method('EnableAscii', 
   7.329 +                   'void', 
   7.330 +                   [param('std::ostream&', 'os'), param('ns3::NetDeviceContainer', 'd')], 
   7.331 +                   is_static=True)
   7.332      ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
   7.333 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('ns3::NodeContainer', 'n')], is_static=True)
   7.334 +    cls.add_method('EnableAscii', 
   7.335 +                   'void', 
   7.336 +                   [param('std::ostream&', 'os'), param('ns3::NodeContainer', 'n')], 
   7.337 +                   is_static=True)
   7.338      ## csma-helper.h: static void ns3::CsmaHelper::EnableAsciiAll(std::ostream & os) [member function]
   7.339 -    cls.add_method('EnableAsciiAll', 'void', [param('std::ostream&', 'os')], is_static=True)
   7.340 +    cls.add_method('EnableAsciiAll', 
   7.341 +                   'void', 
   7.342 +                   [param('std::ostream&', 'os')], 
   7.343 +                   is_static=True)
   7.344      ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c) [member function]
   7.345 -    cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::NodeContainer&', 'c', is_const=True)])
   7.346 +    cls.add_method('Install', 
   7.347 +                   'ns3::NetDeviceContainer', 
   7.348 +                   [param('ns3::NodeContainer&', 'c', is_const=True)])
   7.349      ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, ns3::Ptr<ns3::CsmaChannel> channel) [member function]
   7.350 -    cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::NodeContainer&', 'c', is_const=True), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')])
   7.351 +    cls.add_method('Install', 
   7.352 +                   'ns3::NetDeviceContainer', 
   7.353 +                   [param('ns3::NodeContainer&', 'c', is_const=True), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')])
   7.354      return
   7.355  
   7.356  def register_Ns3UdpEchoServerHelper_methods(root_module, cls):
   7.357      ## udp-echo-helper.h: ns3::UdpEchoServerHelper::UdpEchoServerHelper(uint16_t port) [constructor]
   7.358 -    cls.add_constructor([param('uint16_t', 'port')], visibility='public')
   7.359 +    cls.add_constructor([param('uint16_t', 'port')])
   7.360      ## udp-echo-helper.h: void ns3::UdpEchoServerHelper::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
   7.361 -    cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.362 +    cls.add_method('SetAttribute', 
   7.363 +                   'void', 
   7.364 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.365      ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoServerHelper::Install(ns3::NodeContainer c) [member function]
   7.366 -    cls.add_method('Install', 'ns3::ApplicationContainer', [param('ns3::NodeContainer', 'c')])
   7.367 +    cls.add_method('Install', 
   7.368 +                   'ns3::ApplicationContainer', 
   7.369 +                   [param('ns3::NodeContainer', 'c')])
   7.370      return
   7.371  
   7.372  def register_Ns3OlsrHelper_methods(root_module, cls):
   7.373      ## olsr-helper.h: ns3::OlsrHelper::OlsrHelper() [constructor]
   7.374 -    cls.add_constructor([], visibility='public')
   7.375 +    cls.add_constructor([])
   7.376      ## olsr-helper.h: void ns3::OlsrHelper::SetAgent(std::string tid, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
   7.377 -    cls.add_method('SetAgent', 'void', [param('std::string', 'tid'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue&', 'v0', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.378 +    cls.add_method('SetAgent', 
   7.379 +                   'void', 
   7.380 +                   [param('std::string', 'tid'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue&', 'v0', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.381      ## olsr-helper.h: void ns3::OlsrHelper::Install(ns3::NodeContainer container) [member function]
   7.382 -    cls.add_method('Install', 'void', [param('ns3::NodeContainer', 'container')])
   7.383 +    cls.add_method('Install', 
   7.384 +                   'void', 
   7.385 +                   [param('ns3::NodeContainer', 'container')])
   7.386      ## olsr-helper.h: void ns3::OlsrHelper::Install(ns3::Ptr<ns3::Node> node) [member function]
   7.387 -    cls.add_method('Install', 'void', [param('ns3::Ptr< ns3::Node >', 'node')])
   7.388 +    cls.add_method('Install', 
   7.389 +                   'void', 
   7.390 +                   [param('ns3::Ptr< ns3::Node >', 'node')])
   7.391      ## olsr-helper.h: void ns3::OlsrHelper::InstallAll() [member function]
   7.392 -    cls.add_method('InstallAll', 'void', [])
   7.393 +    cls.add_method('InstallAll', 
   7.394 +                   'void', 
   7.395 +                   [])
   7.396      return
   7.397  
   7.398  def register_Ns3PacketSocketHelper_methods(root_module, cls):
   7.399      ## packet-socket-helper.h: void ns3::PacketSocketHelper::Install(ns3::NodeContainer c) [member function]
   7.400 -    cls.add_method('Install', 'void', [param('ns3::NodeContainer', 'c')])
   7.401 +    cls.add_method('Install', 
   7.402 +                   'void', 
   7.403 +                   [param('ns3::NodeContainer', 'c')])
   7.404      cls.add_constructor([])
   7.405      return
   7.406  
   7.407  def register_Ns3OnOffHelper_methods(root_module, cls):
   7.408      ## on-off-helper.h: ns3::OnOffHelper::OnOffHelper(std::string protocol, ns3::Address address) [constructor]
   7.409 -    cls.add_constructor([param('std::string', 'protocol'), param('ns3::Address', 'address')], visibility='public')
   7.410 +    cls.add_constructor([param('std::string', 'protocol'), param('ns3::Address', 'address')])
   7.411      ## on-off-helper.h: void ns3::OnOffHelper::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
   7.412 -    cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.413 +    cls.add_method('SetAttribute', 
   7.414 +                   'void', 
   7.415 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.416      ## on-off-helper.h: ns3::ApplicationContainer ns3::OnOffHelper::Install(ns3::NodeContainer c) [member function]
   7.417 -    cls.add_method('Install', 'ns3::ApplicationContainer', [param('ns3::NodeContainer', 'c')])
   7.418 +    cls.add_method('Install', 
   7.419 +                   'ns3::ApplicationContainer', 
   7.420 +                   [param('ns3::NodeContainer', 'c')])
   7.421      return
   7.422  
   7.423  def register_Ns3UdpEchoClientHelper_methods(root_module, cls):
   7.424      ## udp-echo-helper.h: ns3::UdpEchoClientHelper::UdpEchoClientHelper(ns3::Ipv4Address ip, uint16_t port) [constructor]
   7.425 -    cls.add_constructor([param('ns3::Ipv4Address', 'ip'), param('uint16_t', 'port')], visibility='public')
   7.426 +    cls.add_constructor([param('ns3::Ipv4Address', 'ip'), param('uint16_t', 'port')])
   7.427      ## udp-echo-helper.h: void ns3::UdpEchoClientHelper::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
   7.428 -    cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.429 +    cls.add_method('SetAttribute', 
   7.430 +                   'void', 
   7.431 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.432      ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(ns3::NodeContainer c) [member function]
   7.433 -    cls.add_method('Install', 'ns3::ApplicationContainer', [param('ns3::NodeContainer', 'c')])
   7.434 +    cls.add_method('Install', 
   7.435 +                   'ns3::ApplicationContainer', 
   7.436 +                   [param('ns3::NodeContainer', 'c')])
   7.437      return
   7.438  
   7.439  def register_Ns3StaticMulticastRouteHelper_methods(root_module, cls):
   7.440      ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper::StaticMulticastRouteHelper() [constructor]
   7.441 -    cls.add_constructor([], visibility='public')
   7.442 +    cls.add_constructor([])
   7.443      ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(ns3::Ptr<ns3::Node> arg0, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr<ns3::NetDevice> input, ns3::NetDeviceContainer output) [member function]
   7.444 -    cls.add_method('AddMulticastRoute', 'void', [param('ns3::Ptr< ns3::Node >', 'arg0'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   7.445 +    cls.add_method('AddMulticastRoute', 
   7.446 +                   'void', 
   7.447 +                   [param('ns3::Ptr< ns3::Node >', 'arg0'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   7.448      ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(ns3::Ptr<ns3::Node> n, ns3::Ptr<ns3::NetDevice> nd) [member function]
   7.449 -    cls.add_method('SetDefaultMulticastRoute', 'void', [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   7.450 +    cls.add_method('SetDefaultMulticastRoute', 
   7.451 +                   'void', 
   7.452 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   7.453      ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::JoinMulticastGroup(ns3::Ptr<ns3::Node> n, ns3::Ipv4Address source, ns3::Ipv4Address group) [member function]
   7.454 -    cls.add_method('JoinMulticastGroup', 'void', [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group')])
   7.455 +    cls.add_method('JoinMulticastGroup', 
   7.456 +                   'void', 
   7.457 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group')])
   7.458      return
   7.459  
   7.460  def register_Ns3Ipv4InterfaceContainer_methods(root_module, cls):
   7.461      ## ipv4-interface-container.h: ns3::Ipv4InterfaceContainer::Ipv4InterfaceContainer() [constructor]
   7.462 -    cls.add_constructor([], visibility='public')
   7.463 +    cls.add_constructor([])
   7.464      ## ipv4-interface-container.h: uint32_t ns3::Ipv4InterfaceContainer::GetN() const [member function]
   7.465 -    cls.add_method('GetN', 'uint32_t', [], is_const=True)
   7.466 +    cls.add_method('GetN', 
   7.467 +                   'uint32_t', 
   7.468 +                   [], 
   7.469 +                   is_const=True)
   7.470      ## ipv4-interface-container.h: ns3::Ipv4Address ns3::Ipv4InterfaceContainer::GetAddress(uint32_t i) const [member function]
   7.471 -    cls.add_method('GetAddress', 'ns3::Ipv4Address', [param('uint32_t', 'i')], is_const=True)
   7.472 +    cls.add_method('GetAddress', 
   7.473 +                   'ns3::Ipv4Address', 
   7.474 +                   [param('uint32_t', 'i')], 
   7.475 +                   is_const=True)
   7.476      ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::SetMetric(uint32_t i, uint16_t metric) [member function]
   7.477 -    cls.add_method('SetMetric', 'void', [param('uint32_t', 'i'), param('uint16_t', 'metric')])
   7.478 +    cls.add_method('SetMetric', 
   7.479 +                   'void', 
   7.480 +                   [param('uint32_t', 'i'), param('uint16_t', 'metric')])
   7.481      ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
   7.482 -    cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
   7.483 +    cls.add_method('Add', 
   7.484 +                   'void', 
   7.485 +                   [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
   7.486      return
   7.487  
   7.488  def register_Ns3ApplicationContainer_methods(root_module, cls):
   7.489      ## application-container.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Application>*,std::vector<ns3::Ptr<ns3::Application>, std::allocator<ns3::Ptr<ns3::Application> > > > ns3::ApplicationContainer::Begin() const [member function]
   7.490 -    cls.add_method('Begin', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Application >, std::vector< ns3::Ptr< ns3::Application >, std::allocator< ns3::Ptr< ns3::Application > > > >', [], is_const=True)
   7.491 +    cls.add_method('Begin', 
   7.492 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Application >, std::vector< ns3::Ptr< ns3::Application >, std::allocator< ns3::Ptr< ns3::Application > > > >', 
   7.493 +                   [], 
   7.494 +                   is_const=True)
   7.495      ## application-container.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Application>*,std::vector<ns3::Ptr<ns3::Application>, std::allocator<ns3::Ptr<ns3::Application> > > > ns3::ApplicationContainer::End() const [member function]
   7.496 -    cls.add_method('End', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Application >, std::vector< ns3::Ptr< ns3::Application >, std::allocator< ns3::Ptr< ns3::Application > > > >', [], is_const=True)
   7.497 +    cls.add_method('End', 
   7.498 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Application >, std::vector< ns3::Ptr< ns3::Application >, std::allocator< ns3::Ptr< ns3::Application > > > >', 
   7.499 +                   [], 
   7.500 +                   is_const=True)
   7.501      ## application-container.h: uint32_t ns3::ApplicationContainer::GetN() const [member function]
   7.502 -    cls.add_method('GetN', 'uint32_t', [], is_const=True)
   7.503 +    cls.add_method('GetN', 
   7.504 +                   'uint32_t', 
   7.505 +                   [], 
   7.506 +                   is_const=True)
   7.507      ## application-container.h: ns3::Ptr<ns3::Application> ns3::ApplicationContainer::Get(uint32_t i) const [member function]
   7.508 -    cls.add_method('Get', 'ns3::Ptr< ns3::Application >', [param('uint32_t', 'i')], is_const=True)
   7.509 +    cls.add_method('Get', 
   7.510 +                   'ns3::Ptr< ns3::Application >', 
   7.511 +                   [param('uint32_t', 'i')], 
   7.512 +                   is_const=True)
   7.513      ## application-container.h: void ns3::ApplicationContainer::Add(ns3::ApplicationContainer other) [member function]
   7.514 -    cls.add_method('Add', 'void', [param('ns3::ApplicationContainer', 'other')])
   7.515 +    cls.add_method('Add', 
   7.516 +                   'void', 
   7.517 +                   [param('ns3::ApplicationContainer', 'other')])
   7.518      ## application-container.h: void ns3::ApplicationContainer::Add(ns3::Ptr<ns3::Application> application) [member function]
   7.519 -    cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::Application >', 'application')])
   7.520 +    cls.add_method('Add', 
   7.521 +                   'void', 
   7.522 +                   [param('ns3::Ptr< ns3::Application >', 'application')])
   7.523      ## application-container.h: void ns3::ApplicationContainer::Start(ns3::Time start) [member function]
   7.524 -    cls.add_method('Start', 'void', [param('ns3::Time', 'start')])
   7.525 +    cls.add_method('Start', 
   7.526 +                   'void', 
   7.527 +                   [param('ns3::Time', 'start')])
   7.528      ## application-container.h: void ns3::ApplicationContainer::Stop(ns3::Time stop) [member function]
   7.529 -    cls.add_method('Stop', 'void', [param('ns3::Time', 'stop')])
   7.530 +    cls.add_method('Stop', 
   7.531 +                   'void', 
   7.532 +                   [param('ns3::Time', 'stop')])
   7.533      cls.add_constructor([])
   7.534      return
   7.535  
   7.536  def register_Ns3WifiHelper_methods(root_module, cls):
   7.537      ## wifi-helper.h: ns3::WifiHelper::WifiHelper() [constructor]
   7.538 -    cls.add_constructor([], visibility='public')
   7.539 +    cls.add_constructor([])
   7.540      ## wifi-helper.h: void ns3::WifiHelper::SetRemoteStationManager(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
   7.541 -    cls.add_method('SetRemoteStationManager', 'void', [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue&', 'v0', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.542 +    cls.add_method('SetRemoteStationManager', 
   7.543 +                   'void', 
   7.544 +                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue&', 'v0', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.545      ## wifi-helper.h: void ns3::WifiHelper::SetMac(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
   7.546 -    cls.add_method('SetMac', 'void', [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue&', 'v0', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.547 +    cls.add_method('SetMac', 
   7.548 +                   'void', 
   7.549 +                   [param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue&', 'v0', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.550      ## wifi-helper.h: void ns3::WifiHelper::SetPhy(std::string phyType, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
   7.551 -    cls.add_method('SetPhy', 'void', [param('std::string', 'phyType'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue&', 'v0', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.552 +    cls.add_method('SetPhy', 
   7.553 +                   'void', 
   7.554 +                   [param('std::string', 'phyType'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue&', 'v0', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue&', 'v1', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue&', 'v2', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue&', 'v3', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue&', 'v4', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue&', 'v5', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue&', 'v6', default_value='ns3::EmptyAttributeValue()', is_const=True), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue&', 'v7', default_value='ns3::EmptyAttributeValue()', is_const=True)])
   7.555      ## wifi-helper.h: static void ns3::WifiHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid) [member function]
   7.556 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], is_static=True)
   7.557 +    cls.add_method('EnablePcap', 
   7.558 +                   'void', 
   7.559 +                   [param('std::string', 'filename'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], 
   7.560 +                   is_static=True)
   7.561      ## wifi-helper.h: static void ns3::WifiHelper::EnablePcap(std::string filename, ns3::NetDeviceContainer d) [member function]
   7.562 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('ns3::NetDeviceContainer', 'd')], is_static=True)
   7.563 +    cls.add_method('EnablePcap', 
   7.564 +                   'void', 
   7.565 +                   [param('std::string', 'filename'), param('ns3::NetDeviceContainer', 'd')], 
   7.566 +                   is_static=True)
   7.567      ## wifi-helper.h: static void ns3::WifiHelper::EnablePcap(std::string filename, ns3::NodeContainer n) [member function]
   7.568 -    cls.add_method('EnablePcap', 'void', [param('std::string', 'filename'), param('ns3::NodeContainer', 'n')], is_static=True)
   7.569 +    cls.add_method('EnablePcap', 
   7.570 +                   'void', 
   7.571 +                   [param('std::string', 'filename'), param('ns3::NodeContainer', 'n')], 
   7.572 +                   is_static=True)
   7.573      ## wifi-helper.h: static void ns3::WifiHelper::EnablePcapAll(std::string filename) [member function]
   7.574 -    cls.add_method('EnablePcapAll', 'void', [param('std::string', 'filename')], is_static=True)
   7.575 +    cls.add_method('EnablePcapAll', 
   7.576 +                   'void', 
   7.577 +                   [param('std::string', 'filename')], 
   7.578 +                   is_static=True)
   7.579      ## wifi-helper.h: static void ns3::WifiHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
   7.580 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], is_static=True)
   7.581 +    cls.add_method('EnableAscii', 
   7.582 +                   'void', 
   7.583 +                   [param('std::ostream&', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')], 
   7.584 +                   is_static=True)
   7.585      ## wifi-helper.h: static void ns3::WifiHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
   7.586 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('ns3::NetDeviceContainer', 'd')], is_static=True)
   7.587 +    cls.add_method('EnableAscii', 
   7.588 +                   'void', 
   7.589 +                   [param('std::ostream&', 'os'), param('ns3::NetDeviceContainer', 'd')], 
   7.590 +                   is_static=True)
   7.591      ## wifi-helper.h: static void ns3::WifiHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
   7.592 -    cls.add_method('EnableAscii', 'void', [param('std::ostream&', 'os'), param('ns3::NodeContainer', 'n')], is_static=True)
   7.593 +    cls.add_method('EnableAscii', 
   7.594 +                   'void', 
   7.595 +                   [param('std::ostream&', 'os'), param('ns3::NodeContainer', 'n')], 
   7.596 +                   is_static=True)
   7.597      ## wifi-helper.h: static void ns3::WifiHelper::EnableAsciiAll(std::ostream & os) [member function]
   7.598 -    cls.add_method('EnableAsciiAll', 'void', [param('std::ostream&', 'os')], is_static=True)
   7.599 +    cls.add_method('EnableAsciiAll', 
   7.600 +                   'void', 
   7.601 +                   [param('std::ostream&', 'os')], 
   7.602 +                   is_static=True)
   7.603      ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::NodeContainer c) const [member function]
   7.604 -    cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::NodeContainer', 'c')], is_const=True)
   7.605 +    cls.add_method('Install', 
   7.606 +                   'ns3::NetDeviceContainer', 
   7.607 +                   [param('ns3::NodeContainer', 'c')], 
   7.608 +                   is_const=True)
   7.609      ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::NodeContainer c, ns3::Ptr<ns3::WifiChannel> channel) const [member function]
   7.610 -    cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::NodeContainer', 'c'), param('ns3::Ptr< ns3::WifiChannel >', 'channel')], is_const=True)
   7.611 +    cls.add_method('Install', 
   7.612 +                   'ns3::NetDeviceContainer', 
   7.613 +                   [param('ns3::NodeContainer', 'c'), param('ns3::Ptr< ns3::WifiChannel >', 'channel')], 
   7.614 +                   is_const=True)
   7.615      return
   7.616  
   7.617  def register_Ns3Ipv4AddressHelper_methods(root_module, cls):
   7.618      ## ipv4-address-helper.h: ns3::Ipv4AddressHelper::Ipv4AddressHelper() [constructor]
   7.619 -    cls.add_constructor([], visibility='public')
   7.620 +    cls.add_constructor([])
   7.621      ## ipv4-address-helper.h: void ns3::Ipv4AddressHelper::SetBase(ns3::Ipv4Address network, ns3::Ipv4Mask mask, ns3::Ipv4Address base="0.0.0.1") [member function]
   7.622 -    cls.add_method('SetBase', 'void', [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'mask'), param('ns3::Ipv4Address', 'base', default_value='"0.0.0.1"')])
   7.623 +    cls.add_method('SetBase', 
   7.624 +                   'void', 
   7.625 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'mask'), param('ns3::Ipv4Address', 'base', default_value='"0.0.0.1"')])
   7.626      ## ipv4-address-helper.h: ns3::Ipv4Address ns3::Ipv4AddressHelper::NewNetwork() [member function]
   7.627 -    cls.add_method('NewNetwork', 'ns3::Ipv4Address', [])
   7.628 +    cls.add_method('NewNetwork', 
   7.629 +                   'ns3::Ipv4Address', 
   7.630 +                   [])
   7.631      ## ipv4-address-helper.h: ns3::Ipv4Address ns3::Ipv4AddressHelper::NewAddress() [member function]
   7.632 -    cls.add_method('NewAddress', 'ns3::Ipv4Address', [])
   7.633 +    cls.add_method('NewAddress', 
   7.634 +                   'ns3::Ipv4Address', 
   7.635 +                   [])
   7.636      ## ipv4-address-helper.h: ns3::Ipv4InterfaceContainer ns3::Ipv4AddressHelper::Assign(ns3::NetDeviceContainer const & c) [member function]
   7.637 -    cls.add_method('Assign', 'ns3::Ipv4InterfaceContainer', [param('ns3::NetDeviceContainer&', 'c', is_const=True)])
   7.638 +    cls.add_method('Assign', 
   7.639 +                   'ns3::Ipv4InterfaceContainer', 
   7.640 +                   [param('ns3::NetDeviceContainer&', 'c', is_const=True)])
   7.641      return
   7.642  
   7.643  def register_Ns3PacketSinkHelper_methods(root_module, cls):
   7.644      ## packet-sink-helper.h: ns3::PacketSinkHelper::PacketSinkHelper(std::string protocol, ns3::Address address) [constructor]
   7.645 -    cls.add_constructor([param('std::string', 'protocol'), param('ns3::Address', 'address')], visibility='public')
   7.646 +    cls.add_constructor([param('std::string', 'protocol'), param('ns3::Address', 'address')])
   7.647      ## packet-sink-helper.h: void ns3::PacketSinkHelper::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
   7.648 -    cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.649 +    cls.add_method('SetAttribute', 
   7.650 +                   'void', 
   7.651 +                   [param('std::string', 'name'), param('ns3::AttributeValue&', 'value', is_const=True)])
   7.652      ## packet-sink-helper.h: ns3::ApplicationContainer ns3::PacketSinkHelper::Install(ns3::NodeContainer c) [member function]
   7.653 -    cls.add_method('Install', 'ns3::ApplicationContainer', [param('ns3::NodeContainer', 'c')])
   7.654 +    cls.add_method('Install', 
   7.655 +                   'ns3::ApplicationContainer', 
   7.656 +                   [param('ns3::NodeContainer', 'c')])
   7.657      return
   7.658  
   7.659  def register_Ns3Ns2MobilityHelper_methods(root_module, cls):
   7.660      ## ns2-mobility-helper.h: ns3::Ns2MobilityHelper::Ns2MobilityHelper(std::string filename) [constructor]
   7.661 -    cls.add_constructor([param('std::string', 'filename')], visibility='public')
   7.662 +    cls.add_constructor([param('std::string', 'filename')])
   7.663      ## ns2-mobility-helper.h: void ns3::Ns2MobilityHelper::Install() const [member function]
   7.664 -    cls.add_method('Install', 'void', [], is_const=True)
   7.665 +    cls.add_method('Install', 
   7.666 +                   'void', 
   7.667 +                   [], 
   7.668 +                   is_const=True)
   7.669      return
   7.670  
   7.671  def register_functions(root_module):
     8.1 --- a/bindings/python/ns3_module_internet_stack.py	Mon Jul 21 11:43:05 2008 +0100
     8.2 +++ b/bindings/python/ns3_module_internet_stack.py	Mon Jul 21 15:30:15 2008 +0100
     8.3 @@ -1,4 +1,4 @@
     8.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     8.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     8.6  
     8.7  def register_types(module):
     8.8      root_module = module.get_root()
     8.9 @@ -66,267 +66,557 @@
    8.10  
    8.11  def register_Ns3Ipv4Interface_methods(root_module, cls):
    8.12      ## ipv4-interface.h: static ns3::TypeId ns3::Ipv4Interface::GetTypeId() [member function]
    8.13 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
    8.14 +    cls.add_method('GetTypeId', 
    8.15 +                   'ns3::TypeId', 
    8.16 +                   [], 
    8.17 +                   is_static=True)
    8.18      ## ipv4-interface.h: ns3::Ipv4Interface::Ipv4Interface() [constructor]
    8.19 -    cls.add_constructor([], visibility='public')
    8.20 +    cls.add_constructor([])
    8.21      ## ipv4-interface.h: ns3::Ptr<ns3::NetDevice> ns3::Ipv4Interface::GetDevice() const [member function]
    8.22 -    cls.add_method('GetDevice', 'ns3::Ptr< ns3::NetDevice >', [], is_pure_virtual=True, is_const=True, is_virtual=True)
    8.23 +    cls.add_method('GetDevice', 
    8.24 +                   'ns3::Ptr< ns3::NetDevice >', 
    8.25 +                   [], 
    8.26 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    8.27      ## ipv4-interface.h: void ns3::Ipv4Interface::SetAddress(ns3::Ipv4Address a) [member function]
    8.28 -    cls.add_method('SetAddress', 'void', [param('ns3::Ipv4Address', 'a')])
    8.29 +    cls.add_method('SetAddress', 
    8.30 +                   'void', 
    8.31 +                   [param('ns3::Ipv4Address', 'a')])
    8.32      ## ipv4-interface.h: void ns3::Ipv4Interface::SetNetworkMask(ns3::Ipv4Mask mask) [member function]
    8.33 -    cls.add_method('SetNetworkMask', 'void', [param('ns3::Ipv4Mask', 'mask')])
    8.34 +    cls.add_method('SetNetworkMask', 
    8.35 +                   'void', 
    8.36 +                   [param('ns3::Ipv4Mask', 'mask')])
    8.37      ## ipv4-interface.h: ns3::Ipv4Address ns3::Ipv4Interface::GetBroadcast() const [member function]
    8.38 -    cls.add_method('GetBroadcast', 'ns3::Ipv4Address', [], is_const=True)
    8.39 +    cls.add_method('GetBroadcast', 
    8.40 +                   'ns3::Ipv4Address', 
    8.41 +                   [], 
    8.42 +                   is_const=True)
    8.43      ## ipv4-interface.h: ns3::Ipv4Mask ns3::Ipv4Interface::GetNetworkMask() const [member function]
    8.44 -    cls.add_method('GetNetworkMask', 'ns3::Ipv4Mask', [], is_const=True)
    8.45 +    cls.add_method('GetNetworkMask', 
    8.46 +                   'ns3::Ipv4Mask', 
    8.47 +                   [], 
    8.48 +                   is_const=True)
    8.49      ## ipv4-interface.h: void ns3::Ipv4Interface::SetMetric(uint16_t metric) [member function]
    8.50 -    cls.add_method('SetMetric', 'void', [param('uint16_t', 'metric')])
    8.51 +    cls.add_method('SetMetric', 
    8.52 +                   'void', 
    8.53 +                   [param('uint16_t', 'metric')])
    8.54      ## ipv4-interface.h: uint16_t ns3::Ipv4Interface::GetMetric() const [member function]
    8.55 -    cls.add_method('GetMetric', 'uint16_t', [], is_const=True)
    8.56 +    cls.add_method('GetMetric', 
    8.57 +                   'uint16_t', 
    8.58 +                   [], 
    8.59 +                   is_const=True)
    8.60      ## ipv4-interface.h: ns3::Ipv4Address ns3::Ipv4Interface::GetAddress() const [member function]
    8.61 -    cls.add_method('GetAddress', 'ns3::Ipv4Address', [], is_const=True)
    8.62 +    cls.add_method('GetAddress', 
    8.63 +                   'ns3::Ipv4Address', 
    8.64 +                   [], 
    8.65 +                   is_const=True)
    8.66      ## ipv4-interface.h: uint16_t ns3::Ipv4Interface::GetMtu() const [member function]
    8.67 -    cls.add_method('GetMtu', 'uint16_t', [], is_const=True)
    8.68 +    cls.add_method('GetMtu', 
    8.69 +                   'uint16_t', 
    8.70 +                   [], 
    8.71 +                   is_const=True)
    8.72      ## ipv4-interface.h: bool ns3::Ipv4Interface::IsUp() const [member function]
    8.73 -    cls.add_method('IsUp', 'bool', [], is_const=True)
    8.74 +    cls.add_method('IsUp', 
    8.75 +                   'bool', 
    8.76 +                   [], 
    8.77 +                   is_const=True)
    8.78      ## ipv4-interface.h: bool ns3::Ipv4Interface::IsDown() const [member function]
    8.79 -    cls.add_method('IsDown', 'bool', [], is_const=True)
    8.80 +    cls.add_method('IsDown', 
    8.81 +                   'bool', 
    8.82 +                   [], 
    8.83 +                   is_const=True)
    8.84      ## ipv4-interface.h: void ns3::Ipv4Interface::SetUp() [member function]
    8.85 -    cls.add_method('SetUp', 'void', [])
    8.86 +    cls.add_method('SetUp', 
    8.87 +                   'void', 
    8.88 +                   [])
    8.89      ## ipv4-interface.h: void ns3::Ipv4Interface::SetDown() [member function]
    8.90 -    cls.add_method('SetDown', 'void', [])
    8.91 +    cls.add_method('SetDown', 
    8.92 +                   'void', 
    8.93 +                   [])
    8.94      ## ipv4-interface.h: void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
    8.95 -    cls.add_method('Send', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
    8.96 +    cls.add_method('Send', 
    8.97 +                   'void', 
    8.98 +                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')])
    8.99      ## ipv4-interface.h: void ns3::Ipv4Interface::DoDispose() [member function]
   8.100 -    cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True)
   8.101 +    cls.add_method('DoDispose', 
   8.102 +                   'void', 
   8.103 +                   [], 
   8.104 +                   visibility='protected', is_virtual=True)
   8.105      ## ipv4-interface.h: void ns3::Ipv4Interface::SendTo(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
   8.106 -    cls.add_method('SendTo', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')], is_pure_virtual=True, visibility='private', is_virtual=True)
   8.107 +    cls.add_method('SendTo', 
   8.108 +                   'void', 
   8.109 +                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'dest')], 
   8.110 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
   8.111      return
   8.112  
   8.113  def register_Ns3UdpHeader_methods(root_module, cls):
   8.114      ## udp-header.h: ns3::UdpHeader::UdpHeader() [constructor]
   8.115 -    cls.add_constructor([], visibility='public')
   8.116 +    cls.add_constructor([])
   8.117      ## udp-header.h: void ns3::UdpHeader::EnableChecksums() [member function]
   8.118 -    cls.add_method('EnableChecksums', 'void', [])
   8.119 +    cls.add_method('EnableChecksums', 
   8.120 +                   'void', 
   8.121 +                   [])
   8.122      ## udp-header.h: void ns3::UdpHeader::SetDestinationPort(uint16_t port) [member function]
   8.123 -    cls.add_method('SetDestinationPort', 'void', [param('uint16_t', 'port')])
   8.124 +    cls.add_method('SetDestinationPort', 
   8.125 +                   'void', 
   8.126 +                   [param('uint16_t', 'port')])
   8.127      ## udp-header.h: void ns3::UdpHeader::SetSourcePort(uint16_t port) [member function]
   8.128 -    cls.add_method('SetSourcePort', 'void', [param('uint16_t', 'port')])
   8.129 +    cls.add_method('SetSourcePort', 
   8.130 +                   'void', 
   8.131 +                   [param('uint16_t', 'port')])
   8.132      ## udp-header.h: uint16_t ns3::UdpHeader::GetSourcePort() const [member function]
   8.133 -    cls.add_method('GetSourcePort', 'uint16_t', [], is_const=True)
   8.134 +    cls.add_method('GetSourcePort', 
   8.135 +                   'uint16_t', 
   8.136 +                   [], 
   8.137 +                   is_const=True)
   8.138      ## udp-header.h: uint16_t ns3::UdpHeader::GetDestinationPort() const [member function]
   8.139 -    cls.add_method('GetDestinationPort', 'uint16_t', [], is_const=True)
   8.140 +    cls.add_method('GetDestinationPort', 
   8.141 +                   'uint16_t', 
   8.142 +                   [], 
   8.143 +                   is_const=True)
   8.144      ## udp-header.h: void ns3::UdpHeader::InitializeChecksum(ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol) [member function]
   8.145 -    cls.add_method('InitializeChecksum', 'void', [param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol')])
   8.146 +    cls.add_method('InitializeChecksum', 
   8.147 +                   'void', 
   8.148 +                   [param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol')])
   8.149      ## udp-header.h: static ns3::TypeId ns3::UdpHeader::GetTypeId() [member function]
   8.150 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   8.151 +    cls.add_method('GetTypeId', 
   8.152 +                   'ns3::TypeId', 
   8.153 +                   [], 
   8.154 +                   is_static=True)
   8.155      ## udp-header.h: ns3::TypeId ns3::UdpHeader::GetInstanceTypeId() const [member function]
   8.156 -    cls.add_method('GetInstanceTypeId', 'ns3::TypeId', [], is_const=True, is_virtual=True)
   8.157 +    cls.add_method('GetInstanceTypeId', 
   8.158 +                   'ns3::TypeId', 
   8.159 +                   [], 
   8.160 +                   is_const=True, is_virtual=True)
   8.161      ## udp-header.h: void ns3::UdpHeader::Print(std::ostream & os) const [member function]
   8.162 -    cls.add_method('Print', 'void', [param('std::ostream&', 'os')], is_const=True, is_virtual=True)
   8.163 +    cls.add_method('Print', 
   8.164 +                   'void', 
   8.165 +                   [param('std::ostream&', 'os')], 
   8.166 +                   is_const=True, is_virtual=True)
   8.167      ## udp-header.h: uint32_t ns3::UdpHeader::GetSerializedSize() const [member function]
   8.168 -    cls.add_method('GetSerializedSize', 'uint32_t', [], is_const=True, is_virtual=True)
   8.169 +    cls.add_method('GetSerializedSize', 
   8.170 +                   'uint32_t', 
   8.171 +                   [], 
   8.172 +                   is_const=True, is_virtual=True)
   8.173      ## udp-header.h: void ns3::UdpHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
   8.174 -    cls.add_method('Serialize', 'void', [param('ns3::Buffer::Iterator', 'start')], is_const=True, is_virtual=True)
   8.175 +    cls.add_method('Serialize', 
   8.176 +                   'void', 
   8.177 +                   [param('ns3::Buffer::Iterator', 'start')], 
   8.178 +                   is_const=True, is_virtual=True)
   8.179      ## udp-header.h: uint32_t ns3::UdpHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
   8.180 -    cls.add_method('Deserialize', 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True)
   8.181 +    cls.add_method('Deserialize', 
   8.182 +                   'uint32_t', 
   8.183 +                   [param('ns3::Buffer::Iterator', 'start')], 
   8.184 +                   is_virtual=True)
   8.185      ## udp-header.h: bool ns3::UdpHeader::IsChecksumOk() const [member function]
   8.186 -    cls.add_method('IsChecksumOk', 'bool', [], is_const=True)
   8.187 +    cls.add_method('IsChecksumOk', 
   8.188 +                   'bool', 
   8.189 +                   [], 
   8.190 +                   is_const=True)
   8.191      return
   8.192  
   8.193  def register_Ns3TcpHeader_methods(root_module, cls):
   8.194      ## tcp-header.h: ns3::TcpHeader::TcpHeader() [constructor]
   8.195 -    cls.add_constructor([], visibility='public')
   8.196 +    cls.add_constructor([])
   8.197      ## tcp-header.h: void ns3::TcpHeader::EnableChecksums() [member function]
   8.198 -    cls.add_method('EnableChecksums', 'void', [])
   8.199 +    cls.add_method('EnableChecksums', 
   8.200 +                   'void', 
   8.201 +                   [])
   8.202      ## tcp-header.h: void ns3::TcpHeader::SetSourcePort(uint16_t port) [member function]
   8.203 -    cls.add_method('SetSourcePort', 'void', [param('uint16_t', 'port')])
   8.204 +    cls.add_method('SetSourcePort', 
   8.205 +                   'void', 
   8.206 +                   [param('uint16_t', 'port')])
   8.207      ## tcp-header.h: void ns3::TcpHeader::SetDestinationPort(uint16_t port) [member function]
   8.208 -    cls.add_method('SetDestinationPort', 'void', [param('uint16_t', 'port')])
   8.209 +    cls.add_method('SetDestinationPort', 
   8.210 +                   'void', 
   8.211 +                   [param('uint16_t', 'port')])
   8.212      ## tcp-header.h: void ns3::TcpHeader::SetSequenceNumber(SequenceNumber sequenceNumber) [member function]
   8.213 -    cls.add_method('SetSequenceNumber', 'void', [param('SequenceNumber', 'sequenceNumber')])
   8.214 +    cls.add_method('SetSequenceNumber', 
   8.215 +                   'void', 
   8.216 +                   [param('SequenceNumber', 'sequenceNumber')])
   8.217      ## tcp-header.h: void ns3::TcpHeader::SetAckNumber(SequenceNumber ackNumber) [member function]
   8.218 -    cls.add_method('SetAckNumber', 'void', [param('SequenceNumber', 'ackNumber')])
   8.219 +    cls.add_method('SetAckNumber', 
   8.220 +                   'void', 
   8.221 +                   [param('SequenceNumber', 'ackNumber')])
   8.222      ## tcp-header.h: void ns3::TcpHeader::SetLength(uint8_t length) [member function]
   8.223 -    cls.add_method('SetLength', 'void', [param('uint8_t', 'length')])
   8.224 +    cls.add_method('SetLength', 
   8.225 +                   'void', 
   8.226 +                   [param('uint8_t', 'length')])
   8.227      ## tcp-header.h: void ns3::TcpHeader::SetFlags(uint8_t flags) [member function]
   8.228 -    cls.add_method('SetFlags', 'void', [param('uint8_t', 'flags')])
   8.229 +    cls.add_method('SetFlags', 
   8.230 +                   'void', 
   8.231 +                   [param('uint8_t', 'flags')])
   8.232      ## tcp-header.h: void ns3::TcpHeader::SetWindowSize(uint16_t windowSize) [member function]
   8.233 -    cls.add_method('SetWindowSize', 'void', [param('uint16_t', 'windowSize')])
   8.234 +    cls.add_method('SetWindowSize', 
   8.235 +                   'void', 
   8.236 +                   [param('uint16_t', 'windowSize')])
   8.237      ## tcp-header.h: void ns3::TcpHeader::SetUrgentPointer(uint16_t urgentPointer) [member function]
   8.238 -    cls.add_method('SetUrgentPointer', 'void', [param('uint16_t', 'urgentPointer')])
   8.239 +    cls.add_method('SetUrgentPointer', 
   8.240 +                   'void', 
   8.241 +                   [param('uint16_t', 'urgentPointer')])
   8.242      ## tcp-header.h: uint16_t ns3::TcpHeader::GetSourcePort() const [member function]
   8.243 -    cls.add_method('GetSourcePort', 'uint16_t', [], is_const=True)
   8.244 +    cls.add_method('GetSourcePort', 
   8.245 +                   'uint16_t', 
   8.246 +                   [], 
   8.247 +                   is_const=True)
   8.248      ## tcp-header.h: uint16_t ns3::TcpHeader::GetDestinationPort() const [member function]
   8.249 -    cls.add_method('GetDestinationPort', 'uint16_t', [], is_const=True)
   8.250 +    cls.add_method('GetDestinationPort', 
   8.251 +                   'uint16_t', 
   8.252 +                   [], 
   8.253 +                   is_const=True)
   8.254      ## tcp-header.h: SequenceNumber ns3::TcpHeader::GetSequenceNumber() const [member function]
   8.255 -    cls.add_method('GetSequenceNumber', 'SequenceNumber', [], is_const=True)
   8.256 +    cls.add_method('GetSequenceNumber', 
   8.257 +                   'SequenceNumber', 
   8.258 +                   [], 
   8.259 +                   is_const=True)
   8.260      ## tcp-header.h: SequenceNumber ns3::TcpHeader::GetAckNumber() const [member function]
   8.261 -    cls.add_method('GetAckNumber', 'SequenceNumber', [], is_const=True)
   8.262 +    cls.add_method('GetAckNumber', 
   8.263 +                   'SequenceNumber', 
   8.264 +                   [], 
   8.265 +                   is_const=True)
   8.266      ## tcp-header.h: uint8_t ns3::TcpHeader::GetLength() const [member function]
   8.267 -    cls.add_method('GetLength', 'uint8_t', [], is_const=True)
   8.268 +    cls.add_method('GetLength', 
   8.269 +                   'uint8_t', 
   8.270 +                   [], 
   8.271 +                   is_const=True)
   8.272      ## tcp-header.h: uint8_t ns3::TcpHeader::GetFlags() const [member function]
   8.273 -    cls.add_method('GetFlags', 'uint8_t', [], is_const=True)
   8.274 +    cls.add_method('GetFlags', 
   8.275 +                   'uint8_t', 
   8.276 +                   [], 
   8.277 +                   is_const=True)
   8.278      ## tcp-header.h: uint16_t ns3::TcpHeader::GetWindowSize() const [member function]
   8.279 -    cls.add_method('GetWindowSize', 'uint16_t', [], is_const=True)
   8.280 +    cls.add_method('GetWindowSize', 
   8.281 +                   'uint16_t', 
   8.282 +                   [], 
   8.283 +                   is_const=True)
   8.284      ## tcp-header.h: uint16_t ns3::TcpHeader::GetUrgentPointer() const [member function]
   8.285 -    cls.add_method('GetUrgentPointer', 'uint16_t', [], is_const=True)
   8.286 +    cls.add_method('GetUrgentPointer', 
   8.287 +                   'uint16_t', 
   8.288 +                   [], 
   8.289 +                   is_const=True)
   8.290      ## tcp-header.h: void ns3::TcpHeader::InitializeChecksum(ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol) [member function]
   8.291 -    cls.add_method('InitializeChecksum', 'void', [param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol')])
   8.292 +    cls.add_method('InitializeChecksum', 
   8.293 +                   'void', 
   8.294 +                   [param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol')])
   8.295      ## tcp-header.h: static ns3::TypeId ns3::TcpHeader::GetTypeId() [member function]
   8.296 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   8.297 +    cls.add_method('GetTypeId', 
   8.298 +                   'ns3::TypeId', 
   8.299 +                   [], 
   8.300 +                   is_static=True)
   8.301      ## tcp-header.h: ns3::TypeId ns3::TcpHeader::GetInstanceTypeId() const [member function]
   8.302 -    cls.add_method('GetInstanceTypeId', 'ns3::TypeId', [], is_const=True, is_virtual=True)
   8.303 +    cls.add_method('GetInstanceTypeId', 
   8.304 +                   'ns3::TypeId', 
   8.305 +                   [], 
   8.306 +                   is_const=True, is_virtual=True)
   8.307      ## tcp-header.h: void ns3::TcpHeader::Print(std::ostream & os) const [member function]
   8.308 -    cls.add_method('Print', 'void', [param('std::ostream&', 'os')], is_const=True, is_virtual=True)
   8.309 +    cls.add_method('Print', 
   8.310 +                   'void', 
   8.311 +                   [param('std::ostream&', 'os')], 
   8.312 +                   is_const=True, is_virtual=True)
   8.313      ## tcp-header.h: uint32_t ns3::TcpHeader::GetSerializedSize() const [member function]
   8.314 -    cls.add_method('GetSerializedSize', 'uint32_t', [], is_const=True, is_virtual=True)
   8.315 +    cls.add_method('GetSerializedSize', 
   8.316 +                   'uint32_t', 
   8.317 +                   [], 
   8.318 +                   is_const=True, is_virtual=True)
   8.319      ## tcp-header.h: void ns3::TcpHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
   8.320 -    cls.add_method('Serialize', 'void', [param('ns3::Buffer::Iterator', 'start')], is_const=True, is_virtual=True)
   8.321 +    cls.add_method('Serialize', 
   8.322 +                   'void', 
   8.323 +                   [param('ns3::Buffer::Iterator', 'start')], 
   8.324 +                   is_const=True, is_virtual=True)
   8.325      ## tcp-header.h: uint32_t ns3::TcpHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
   8.326 -    cls.add_method('Deserialize', 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True)
   8.327 +    cls.add_method('Deserialize', 
   8.328 +                   'uint32_t', 
   8.329 +                   [param('ns3::Buffer::Iterator', 'start')], 
   8.330 +                   is_virtual=True)
   8.331      ## tcp-header.h: bool ns3::TcpHeader::IsChecksumOk() const [member function]
   8.332 -    cls.add_method('IsChecksumOk', 'bool', [], is_const=True)
   8.333 +    cls.add_method('IsChecksumOk', 
   8.334 +                   'bool', 
   8.335 +                   [], 
   8.336 +                   is_const=True)
   8.337      return
   8.338  
   8.339  def register_Ns3Ipv4StaticRouting_methods(root_module, cls):
   8.340      ## ipv4-static-routing.h: ns3::Ipv4StaticRouting::Ipv4StaticRouting() [constructor]
   8.341 -    cls.add_constructor([], visibility='public')
   8.342 +    cls.add_constructor([])
   8.343      ## ipv4-static-routing.h: bool ns3::Ipv4StaticRouting::RequestRoute(uint32_t ifIndex, ns3::Ipv4Header const & ipHeader, ns3::Ptr<ns3::Packet> packet, ns3::Callback<void,bool,const ns3::Ipv4Route&,ns3::Ptr<ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty> routeReply) [member function]
   8.344 -    cls.add_method('RequestRoute', 'bool', [param('uint32_t', 'ifIndex'), param('ns3::Ipv4Header&', 'ipHeader', is_const=True), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, const ns3::Ipv4Route&, ns3::Ptr< ns3::Packet >, const ns3::Ipv4Header&, ns3::empty, ns3::empty >', 'routeReply')], is_virtual=True)
   8.345 +    cls.add_method('RequestRoute', 
   8.346 +                   'bool', 
   8.347 +                   [param('uint32_t', 'ifIndex'), param('ns3::Ipv4Header&', 'ipHeader', is_const=True), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, const ns3::Ipv4Route&, ns3::Ptr< ns3::Packet >, const ns3::Ipv4Header&, ns3::empty, ns3::empty >', 'routeReply')], 
   8.348 +                   is_virtual=True)
   8.349      ## ipv4-static-routing.h: bool ns3::Ipv4StaticRouting::RequestIfIndex(ns3::Ipv4Address destination, uint32_t & ifIndex) [member function]
   8.350 -    cls.add_method('RequestIfIndex', 'bool', [param('ns3::Ipv4Address', 'destination'), param('uint32_t&', 'ifIndex')], is_virtual=True)
   8.351 +    cls.add_method('RequestIfIndex', 
   8.352 +                   'bool', 
   8.353 +                   [param('ns3::Ipv4Address', 'destination'), param('uint32_t&', 'ifIndex')], 
   8.354 +                   is_virtual=True)
   8.355      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
   8.356 -    cls.add_method('AddHostRouteTo', 'void', [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.357 +    cls.add_method('AddHostRouteTo', 
   8.358 +                   'void', 
   8.359 +                   [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.360      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function]
   8.361 -    cls.add_method('AddHostRouteTo', 'void', [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')])
   8.362 +    cls.add_method('AddHostRouteTo', 
   8.363 +                   'void', 
   8.364 +                   [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')])
   8.365      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
   8.366 -    cls.add_method('AddNetworkRouteTo', 'void', [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.367 +    cls.add_method('AddNetworkRouteTo', 
   8.368 +                   'void', 
   8.369 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.370      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function]
   8.371 -    cls.add_method('AddNetworkRouteTo', 'void', [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')])
   8.372 +    cls.add_method('AddNetworkRouteTo', 
   8.373 +                   'void', 
   8.374 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')])
   8.375      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::SetDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function]
   8.376 -    cls.add_method('SetDefaultRoute', 'void', [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.377 +    cls.add_method('SetDefaultRoute', 
   8.378 +                   'void', 
   8.379 +                   [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.380      ## ipv4-static-routing.h: uint32_t ns3::Ipv4StaticRouting::GetNRoutes() [member function]
   8.381 -    cls.add_method('GetNRoutes', 'uint32_t', [])
   8.382 +    cls.add_method('GetNRoutes', 
   8.383 +                   'uint32_t', 
   8.384 +                   [])
   8.385      ## ipv4-static-routing.h: ns3::Ipv4Route * ns3::Ipv4StaticRouting::GetDefaultRoute() [member function]
   8.386 -    cls.add_method('GetDefaultRoute', 'ns3::Ipv4Route *', [])
   8.387 +    cls.add_method('GetDefaultRoute', 
   8.388 +                   'ns3::Ipv4Route *', 
   8.389 +                   [])
   8.390      ## ipv4-static-routing.h: ns3::Ipv4Route * ns3::Ipv4StaticRouting::GetRoute(uint32_t i) [member function]
   8.391 -    cls.add_method('GetRoute', 'ns3::Ipv4Route *', [param('uint32_t', 'i')])
   8.392 +    cls.add_method('GetRoute', 
   8.393 +                   'ns3::Ipv4Route *', 
   8.394 +                   [param('uint32_t', 'i')])
   8.395      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::RemoveRoute(uint32_t i) [member function]
   8.396 -    cls.add_method('RemoveRoute', 'void', [param('uint32_t', 'i')])
   8.397 +    cls.add_method('RemoveRoute', 
   8.398 +                   'void', 
   8.399 +                   [param('uint32_t', 'i')])
   8.400      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector<unsigned int, std::allocator<unsigned int> > outputInterfaces) [member function]
   8.401 -    cls.add_method('AddMulticastRoute', 'void', [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int, std::allocator< unsigned int > >', 'outputInterfaces')])
   8.402 +    cls.add_method('AddMulticastRoute', 
   8.403 +                   'void', 
   8.404 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int, std::allocator< unsigned int > >', 'outputInterfaces')])
   8.405      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::SetDefaultMulticastRoute(uint32_t outputInterface) [member function]
   8.406 -    cls.add_method('SetDefaultMulticastRoute', 'void', [param('uint32_t', 'outputInterface')])
   8.407 +    cls.add_method('SetDefaultMulticastRoute', 
   8.408 +                   'void', 
   8.409 +                   [param('uint32_t', 'outputInterface')])
   8.410      ## ipv4-static-routing.h: uint32_t ns3::Ipv4StaticRouting::GetNMulticastRoutes() const [member function]
   8.411 -    cls.add_method('GetNMulticastRoutes', 'uint32_t', [], is_const=True)
   8.412 +    cls.add_method('GetNMulticastRoutes', 
   8.413 +                   'uint32_t', 
   8.414 +                   [], 
   8.415 +                   is_const=True)
   8.416      ## ipv4-static-routing.h: ns3::Ipv4MulticastRoute * ns3::Ipv4StaticRouting::GetMulticastRoute(uint32_t i) const [member function]
   8.417 -    cls.add_method('GetMulticastRoute', 'ns3::Ipv4MulticastRoute *', [param('uint32_t', 'i')], is_const=True)
   8.418 +    cls.add_method('GetMulticastRoute', 
   8.419 +                   'ns3::Ipv4MulticastRoute *', 
   8.420 +                   [param('uint32_t', 'i')], 
   8.421 +                   is_const=True)
   8.422      ## ipv4-static-routing.h: ns3::Ipv4MulticastRoute * ns3::Ipv4StaticRouting::GetDefaultMulticastRoute() const [member function]
   8.423 -    cls.add_method('GetDefaultMulticastRoute', 'ns3::Ipv4MulticastRoute *', [], is_const=True)
   8.424 +    cls.add_method('GetDefaultMulticastRoute', 
   8.425 +                   'ns3::Ipv4MulticastRoute *', 
   8.426 +                   [], 
   8.427 +                   is_const=True)
   8.428      ## ipv4-static-routing.h: bool ns3::Ipv4StaticRouting::RemoveMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface) [member function]
   8.429 -    cls.add_method('RemoveMulticastRoute', 'bool', [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')])
   8.430 +    cls.add_method('RemoveMulticastRoute', 
   8.431 +                   'bool', 
   8.432 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')])
   8.433      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::RemoveMulticastRoute(uint32_t index) [member function]
   8.434 -    cls.add_method('RemoveMulticastRoute', 'void', [param('uint32_t', 'index')])
   8.435 +    cls.add_method('RemoveMulticastRoute', 
   8.436 +                   'void', 
   8.437 +                   [param('uint32_t', 'index')])
   8.438      ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::DoDispose() [member function]
   8.439 -    cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True)
   8.440 +    cls.add_method('DoDispose', 
   8.441 +                   'void', 
   8.442 +                   [], 
   8.443 +                   visibility='protected', is_virtual=True)
   8.444      return
   8.445  
   8.446  def register_Ns3Ipv4L3Protocol_methods(root_module, cls):
   8.447      ## ipv4-l3-protocol.h: ns3::Ipv4L3Protocol::PROT_NUMBER [variable]
   8.448      cls.add_static_attribute('PROT_NUMBER', retval('uint16_t', is_const=True), is_const=True)
   8.449      ## ipv4-l3-protocol.h: static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function]
   8.450 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   8.451 +    cls.add_method('GetTypeId', 
   8.452 +                   'ns3::TypeId', 
   8.453 +                   [], 
   8.454 +                   is_static=True)
   8.455      ## ipv4-l3-protocol.h: ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor]
   8.456 -    cls.add_constructor([], visibility='public')
   8.457 +    cls.add_constructor([])
   8.458      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr<ns3::Node> node) [member function]
   8.459 -    cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')])
   8.460 +    cls.add_method('SetNode', 
   8.461 +                   'void', 
   8.462 +                   [param('ns3::Ptr< ns3::Node >', 'node')])
   8.463      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function]
   8.464 -    cls.add_method('SetDefaultTtl', 'void', [param('uint8_t', 'ttl')])
   8.465 +    cls.add_method('SetDefaultTtl', 
   8.466 +                   'void', 
   8.467 +                   [param('uint8_t', 'ttl')])
   8.468      ## ipv4-l3-protocol.h: ns3::Ptr<ns3::Ipv4Interface> ns3::Ipv4L3Protocol::FindInterfaceForDevice(ns3::Ptr<const ns3::NetDevice> device) [member function]
   8.469 -    cls.add_method('FindInterfaceForDevice', 'ns3::Ptr< ns3::Ipv4Interface >', [param('ns3::Ptr< const ns3::NetDevice >', 'device')])
   8.470 +    cls.add_method('FindInterfaceForDevice', 
   8.471 +                   'ns3::Ptr< ns3::Ipv4Interface >', 
   8.472 +                   [param('ns3::Ptr< const ns3::NetDevice >', 'device')])
   8.473      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
   8.474 -    cls.add_method('Receive', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address&', 'from', is_const=True), param('ns3::Address&', 'to', is_const=True), param('ns3::NetDevice::PacketType', 'packetType')])
   8.475 +    cls.add_method('Receive', 
   8.476 +                   'void', 
   8.477 +                   [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address&', 'from', is_const=True), param('ns3::Address&', 'to', is_const=True), param('ns3::NetDevice::PacketType', 'packetType')])
   8.478      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Send(ns3::Ptr<ns3::Packet> packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol) [member function]
   8.479 -    cls.add_method('Send', 'void', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol')])
   8.480 +    cls.add_method('Send', 
   8.481 +                   'void', 
   8.482 +                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol')])
   8.483      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::AddHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
   8.484 -    cls.add_method('AddHostRouteTo', 'void', [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.485 +    cls.add_method('AddHostRouteTo', 
   8.486 +                   'void', 
   8.487 +                   [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.488      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function]
   8.489 -    cls.add_method('AddHostRouteTo', 'void', [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')])
   8.490 +    cls.add_method('AddHostRouteTo', 
   8.491 +                   'void', 
   8.492 +                   [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')])
   8.493      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
   8.494 -    cls.add_method('AddNetworkRouteTo', 'void', [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.495 +    cls.add_method('AddNetworkRouteTo', 
   8.496 +                   'void', 
   8.497 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.498      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function]
   8.499 -    cls.add_method('AddNetworkRouteTo', 'void', [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')])
   8.500 +    cls.add_method('AddNetworkRouteTo', 
   8.501 +                   'void', 
   8.502 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')])
   8.503      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function]
   8.504 -    cls.add_method('SetDefaultRoute', 'void', [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.505 +    cls.add_method('SetDefaultRoute', 
   8.506 +                   'void', 
   8.507 +                   [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')])
   8.508      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Lookup(ns3::Ipv4Header const & ipHeader, ns3::Ptr<ns3::Packet> packet, ns3::Callback<void,bool,const ns3::Ipv4Route&,ns3::Ptr<ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty> routeReply) [member function]
   8.509 -    cls.add_method('Lookup', 'void', [param('ns3::Ipv4Header&', 'ipHeader', is_const=True), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, const ns3::Ipv4Route&, ns3::Ptr< ns3::Packet >, const ns3::Ipv4Header&, ns3::empty, ns3::empty >', 'routeReply')])
   8.510 +    cls.add_method('Lookup', 
   8.511 +                   'void', 
   8.512 +                   [param('ns3::Ipv4Header&', 'ipHeader', is_const=True), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, const ns3::Ipv4Route&, ns3::Ptr< ns3::Packet >, const ns3::Ipv4Header&, ns3::empty, ns3::empty >', 'routeReply')])
   8.513      ## ipv4-l3-protocol.h: uint32_t ns3::Ipv4L3Protocol::GetNRoutes() [member function]
   8.514 -    cls.add_method('GetNRoutes', 'uint32_t', [])
   8.515 +    cls.add_method('GetNRoutes', 
   8.516 +                   'uint32_t', 
   8.517 +                   [])
   8.518      ## ipv4-l3-protocol.h: ns3::Ipv4Route * ns3::Ipv4L3Protocol::GetRoute(uint32_t i) [member function]
   8.519 -    cls.add_method('GetRoute', 'ns3::Ipv4Route *', [param('uint32_t', 'i')])
   8.520 +    cls.add_method('GetRoute', 
   8.521 +                   'ns3::Ipv4Route *', 
   8.522 +                   [param('uint32_t', 'i')])
   8.523      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::RemoveRoute(uint32_t i) [member function]
   8.524 -    cls.add_method('RemoveRoute', 'void', [param('uint32_t', 'i')])
   8.525 +    cls.add_method('RemoveRoute', 
   8.526 +                   'void', 
   8.527 +                   [param('uint32_t', 'i')])
   8.528      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::AddMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector<unsigned int, std::allocator<unsigned int> > outputInterfaces) [member function]
   8.529 -    cls.add_method('AddMulticastRoute', 'void', [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int, std::allocator< unsigned int > >', 'outputInterfaces')])
   8.530 +    cls.add_method('AddMulticastRoute', 
   8.531 +                   'void', 
   8.532 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int, std::allocator< unsigned int > >', 'outputInterfaces')])
   8.533      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetDefaultMulticastRoute(uint32_t onputInterface) [member function]
   8.534 -    cls.add_method('SetDefaultMulticastRoute', 'void', [param('uint32_t', 'onputInterface')])
   8.535 +    cls.add_method('SetDefaultMulticastRoute', 
   8.536 +                   'void', 
   8.537 +                   [param('uint32_t', 'onputInterface')])
   8.538      ## ipv4-l3-protocol.h: uint32_t ns3::Ipv4L3Protocol::GetNMulticastRoutes() const [member function]
   8.539 -    cls.add_method('GetNMulticastRoutes', 'uint32_t', [], is_const=True)
   8.540 +    cls.add_method('GetNMulticastRoutes', 
   8.541 +                   'uint32_t', 
   8.542 +                   [], 
   8.543 +                   is_const=True)
   8.544      ## ipv4-l3-protocol.h: ns3::Ipv4MulticastRoute * ns3::Ipv4L3Protocol::GetMulticastRoute(uint32_t i) const [member function]
   8.545 -    cls.add_method('GetMulticastRoute', 'ns3::Ipv4MulticastRoute *', [param('uint32_t', 'i')], is_const=True)
   8.546 +    cls.add_method('GetMulticastRoute', 
   8.547 +                   'ns3::Ipv4MulticastRoute *', 
   8.548 +                   [param('uint32_t', 'i')], 
   8.549 +                   is_const=True)
   8.550      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::RemoveMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface) [member function]
   8.551 -    cls.add_method('RemoveMulticastRoute', 'void', [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')])
   8.552 +    cls.add_method('RemoveMulticastRoute', 
   8.553 +                   'void', 
   8.554 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')])
   8.555      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::RemoveMulticastRoute(uint32_t i) [member function]
   8.556 -    cls.add_method('RemoveMulticastRoute', 'void', [param('uint32_t', 'i')])
   8.557 +    cls.add_method('RemoveMulticastRoute', 
   8.558 +                   'void', 
   8.559 +                   [param('uint32_t', 'i')])
   8.560      ## ipv4-l3-protocol.h: uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr<ns3::NetDevice> device) [member function]
   8.561 -    cls.add_method('AddInterface', 'uint32_t', [param('ns3::Ptr< ns3::NetDevice >', 'device')])
   8.562 +    cls.add_method('AddInterface', 
   8.563 +                   'uint32_t', 
   8.564 +                   [param('ns3::Ptr< ns3::NetDevice >', 'device')])
   8.565      ## ipv4-l3-protocol.h: ns3::Ptr<ns3::Ipv4Interface> ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function]
   8.566 -    cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True)
   8.567 +    cls.add_method('GetInterface', 
   8.568 +                   'ns3::Ptr< ns3::Ipv4Interface >', 
   8.569 +                   [param('uint32_t', 'i')], 
   8.570 +                   is_const=True)
   8.571      ## ipv4-l3-protocol.h: uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function]
   8.572 -    cls.add_method('GetNInterfaces', 'uint32_t', [], is_const=True)
   8.573 +    cls.add_method('GetNInterfaces', 
   8.574 +                   'uint32_t', 
   8.575 +                   [], 
   8.576 +                   is_const=True)
   8.577      ## ipv4-l3-protocol.h: uint32_t ns3::Ipv4L3Protocol::FindInterfaceForAddr(ns3::Ipv4Address addr) const [member function]
   8.578 -    cls.add_method('FindInterfaceForAddr', 'uint32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True)
   8.579 +    cls.add_method('FindInterfaceForAddr', 
   8.580 +                   'uint32_t', 
   8.581 +                   [param('ns3::Ipv4Address', 'addr')], 
   8.582 +                   is_const=True)
   8.583      ## ipv4-l3-protocol.h: uint32_t ns3::Ipv4L3Protocol::FindInterfaceForAddr(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function]
   8.584 -    cls.add_method('FindInterfaceForAddr', 'uint32_t', [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True)
   8.585 +    cls.add_method('FindInterfaceForAddr', 
   8.586 +                   'uint32_t', 
   8.587 +                   [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], 
   8.588 +                   is_const=True)
   8.589      ## ipv4-l3-protocol.h: int32_t ns3::Ipv4L3Protocol::FindInterfaceIndexForDevice(ns3::Ptr<ns3::NetDevice> device) const [member function]
   8.590 -    cls.add_method('FindInterfaceIndexForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_const=True)
   8.591 +    cls.add_method('FindInterfaceIndexForDevice', 
   8.592 +                   'int32_t', 
   8.593 +                   [param('ns3::Ptr< ns3::NetDevice >', 'device')], 
   8.594 +                   is_const=True)
   8.595      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::JoinMulticastGroup(ns3::Ipv4Address origin, ns3::Ipv4Address group) [member function]
   8.596 -    cls.add_method('JoinMulticastGroup', 'void', [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group')])
   8.597 +    cls.add_method('JoinMulticastGroup', 
   8.598 +                   'void', 
   8.599 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group')])
   8.600      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::LeaveMulticastGroup(ns3::Ipv4Address origin, ns3::Ipv4Address group) [member function]
   8.601 -    cls.add_method('LeaveMulticastGroup', 'void', [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group')])
   8.602 +    cls.add_method('LeaveMulticastGroup', 
   8.603 +                   'void', 
   8.604 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group')])
   8.605      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetAddress(uint32_t i, ns3::Ipv4Address address) [member function]
   8.606 -    cls.add_method('SetAddress', 'void', [param('uint32_t', 'i'), param('ns3::Ipv4Address', 'address')])
   8.607 +    cls.add_method('SetAddress', 
   8.608 +                   'void', 
   8.609 +                   [param('uint32_t', 'i'), param('ns3::Ipv4Address', 'address')])
   8.610      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetNetworkMask(uint32_t i, ns3::Ipv4Mask mask) [member function]
   8.611 -    cls.add_method('SetNetworkMask', 'void', [param('uint32_t', 'i'), param('ns3::Ipv4Mask', 'mask')])
   8.612 +    cls.add_method('SetNetworkMask', 
   8.613 +                   'void', 
   8.614 +                   [param('uint32_t', 'i'), param('ns3::Ipv4Mask', 'mask')])
   8.615      ## ipv4-l3-protocol.h: ns3::Ipv4Mask ns3::Ipv4L3Protocol::GetNetworkMask(uint32_t t) const [member function]
   8.616 -    cls.add_method('GetNetworkMask', 'ns3::Ipv4Mask', [param('uint32_t', 't')], is_const=True)
   8.617 +    cls.add_method('GetNetworkMask', 
   8.618 +                   'ns3::Ipv4Mask', 
   8.619 +                   [param('uint32_t', 't')], 
   8.620 +                   is_const=True)
   8.621      ## ipv4-l3-protocol.h: ns3::Ipv4Address ns3::Ipv4L3Protocol::GetAddress(uint32_t i) const [member function]
   8.622 -    cls.add_method('GetAddress', 'ns3::Ipv4Address', [param('uint32_t', 'i')], is_const=True)
   8.623 +    cls.add_method('GetAddress', 
   8.624 +                   'ns3::Ipv4Address', 
   8.625 +                   [param('uint32_t', 'i')], 
   8.626 +                   is_const=True)
   8.627      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
   8.628 -    cls.add_method('SetMetric', 'void', [param('uint32_t', 'i'), param('uint16_t', 'metric')])
   8.629 +    cls.add_method('SetMetric', 
   8.630 +                   'void', 
   8.631 +                   [param('uint32_t', 'i'), param('uint16_t', 'metric')])
   8.632      ## ipv4-l3-protocol.h: uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function]
   8.633 -    cls.add_method('GetMetric', 'uint16_t', [param('uint32_t', 'i')], is_const=True)
   8.634 +    cls.add_method('GetMetric', 
   8.635 +                   'uint16_t', 
   8.636 +                   [param('uint32_t', 'i')], 
   8.637 +                   is_const=True)
   8.638      ## ipv4-l3-protocol.h: bool ns3::Ipv4L3Protocol::GetIfIndexForDestination(ns3::Ipv4Address destination, uint32_t & ifIndex) const [member function]
   8.639 -    cls.add_method('GetIfIndexForDestination', 'bool', [param('ns3::Ipv4Address', 'destination'), param('uint32_t&', 'ifIndex')], is_const=True)
   8.640 +    cls.add_method('GetIfIndexForDestination', 
   8.641 +                   'bool', 
   8.642 +                   [param('ns3::Ipv4Address', 'destination'), param('uint32_t&', 'ifIndex')], 
   8.643 +                   is_const=True)
   8.644      ## ipv4-l3-protocol.h: uint16_t ns3::Ipv4L3Protocol::GetMtu(uint32_t i) const [member function]
   8.645 -    cls.add_method('GetMtu', 'uint16_t', [param('uint32_t', 'i')], is_const=True)
   8.646 +    cls.add_method('GetMtu', 
   8.647 +                   'uint16_t', 
   8.648 +                   [param('uint32_t', 'i')], 
   8.649 +                   is_const=True)
   8.650      ## ipv4-l3-protocol.h: bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function]
   8.651 -    cls.add_method('IsUp', 'bool', [param('uint32_t', 'i')], is_const=True)
   8.652 +    cls.add_method('IsUp', 
   8.653 +                   'bool', 
   8.654 +                   [param('uint32_t', 'i')], 
   8.655 +                   is_const=True)
   8.656      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function]
   8.657 -    cls.add_method('SetUp', 'void', [param('uint32_t', 'i')])
   8.658 +    cls.add_method('SetUp', 
   8.659 +                   'void', 
   8.660 +                   [param('uint32_t', 'i')])
   8.661      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function]
   8.662 -    cls.add_method('SetDown', 'void', [param('uint32_t', 'i')])
   8.663 +    cls.add_method('SetDown', 
   8.664 +                   'void', 
   8.665 +                   [param('uint32_t', 'i')])
   8.666      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::AddRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol, int priority) [member function]
   8.667 -    cls.add_method('AddRoutingProtocol', 'void', [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int', 'priority')])
   8.668 +    cls.add_method('AddRoutingProtocol', 
   8.669 +                   'void', 
   8.670 +                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int', 'priority')])
   8.671      ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::DoDispose() [member function]
   8.672 -    cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True)
   8.673 +    cls.add_method('DoDispose', 
   8.674 +                   'void', 
   8.675 +                   [], 
   8.676 +                   visibility='protected', is_virtual=True)
   8.677      return
   8.678  
   8.679  def register_functions(root_module):
   8.680      module = root_module
   8.681      ## internet-stack.h: extern void ns3::AddInternetStack(ns3::Ptr<ns3::Node> node) [free function]
   8.682 -    module.add_function('AddInternetStack', 'void', [param('ns3::Ptr< ns3::Node >', 'node')])
   8.683 +    module.add_function('AddInternetStack', 
   8.684 +                        'void', 
   8.685 +                        [param('ns3::Ptr< ns3::Node >', 'node')])
   8.686      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   8.687      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   8.688      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
     9.1 --- a/bindings/python/ns3_module_mobility.py	Mon Jul 21 11:43:05 2008 +0100
     9.2 +++ b/bindings/python/ns3_module_mobility.py	Mon Jul 21 15:30:15 2008 +0100
     9.3 @@ -1,4 +1,4 @@
     9.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
     9.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     9.6  
     9.7  def register_types(module):
     9.8      root_module = module.get_root()
     9.9 @@ -112,36 +112,55 @@
    9.10  
    9.11  def register_Ns3StaticSpeedHelper_methods(root_module, cls):
    9.12      ## static-speed-helper.h: ns3::StaticSpeedHelper::StaticSpeedHelper() [constructor]
    9.13 -    cls.add_constructor([], visibility='public')
    9.14 +    cls.add_constructor([])
    9.15      ## static-speed-helper.h: ns3::StaticSpeedHelper::StaticSpeedHelper(ns3::Vector const & position) [constructor]
    9.16 -    cls.add_constructor([param('ns3::Vector&', 'position', is_const=True)], visibility='public')
    9.17 +    cls.add_constructor([param('ns3::Vector&', 'position', is_const=True)])
    9.18      ## static-speed-helper.h: ns3::StaticSpeedHelper::StaticSpeedHelper(ns3::Vector const & position, ns3::Vector const & speed) [constructor]
    9.19 -    cls.add_constructor([param('ns3::Vector&', 'position', is_const=True), param('ns3::Vector&', 'speed', is_const=True)], visibility='public')
    9.20 +    cls.add_constructor([param('ns3::Vector&', 'position', is_const=True), param('ns3::Vector&', 'speed', is_const=True)])
    9.21      ## static-speed-helper.h: void ns3::StaticSpeedHelper::InitializePosition(ns3::Vector const & position) [member function]
    9.22 -    cls.add_method('InitializePosition', 'void', [param('ns3::Vector&', 'position', is_const=True)])
    9.23 +    cls.add_method('InitializePosition', 
    9.24 +                   'void', 
    9.25 +                   [param('ns3::Vector&', 'position', is_const=True)])
    9.26      ## static-speed-helper.h: void ns3::StaticSpeedHelper::Reset(ns3::Vector const & speed) [member function]
    9.27 -    cls.add_method('Reset', 'void', [param('ns3::Vector&', 'speed', is_const=True)])
    9.28 +    cls.add_method('Reset', 
    9.29 +                   'void', 
    9.30 +                   [param('ns3::Vector&', 'speed', is_const=True)])
    9.31      ## static-speed-helper.h: ns3::Vector ns3::StaticSpeedHelper::GetCurrentPosition(ns3::Rectangle const & bounds) const [member function]
    9.32 -    cls.add_method('GetCurrentPosition', 'ns3::Vector', [param('ns3::Rectangle&', 'bounds', is_const=True)], is_const=True)
    9.33 +    cls.add_method('GetCurrentPosition', 
    9.34 +                   'ns3::Vector', 
    9.35 +                   [param('ns3::Rectangle&', 'bounds', is_const=True)], 
    9.36 +                   is_const=True)
    9.37      ## static-speed-helper.h: ns3::Vector ns3::StaticSpeedHelper::GetCurrentPosition() const [member function]
    9.38 -    cls.add_method('GetCurrentPosition', 'ns3::Vector', [], is_const=True)
    9.39 +    cls.add_method('GetCurrentPosition', 
    9.40 +                   'ns3::Vector', 
    9.41 +                   [], 
    9.42 +                   is_const=True)
    9.43      ## static-speed-helper.h: ns3::Vector ns3::StaticSpeedHelper::GetVelocity() const [member function]
    9.44 -    cls.add_method('GetVelocity', 'ns3::Vector', [], is_const=True)
    9.45 +    cls.add_method('GetVelocity', 
    9.46 +                   'ns3::Vector', 
    9.47 +                   [], 
    9.48 +                   is_const=True)
    9.49      ## static-speed-helper.h: void ns3::StaticSpeedHelper::SetSpeed(ns3::Vector const & speed) [member function]
    9.50 -    cls.add_method('SetSpeed', 'void', [param('ns3::Vector&', 'speed', is_const=True)])
    9.51 +    cls.add_method('SetSpeed', 
    9.52 +                   'void', 
    9.53 +                   [param('ns3::Vector&', 'speed', is_const=True)])
    9.54      ## static-speed-helper.h: void ns3::StaticSpeedHelper::Pause() [member function]
    9.55 -    cls.add_method('Pause', 'void', [])
    9.56 +    cls.add_method('Pause', 
    9.57 +                   'void', 
    9.58 +                   [])
    9.59      ## static-speed-helper.h: void ns3::StaticSpeedHelper::Unpause() [member function]
    9.60 -    cls.add_method('Unpause', 'void', [])
    9.61 +    cls.add_method('Unpause', 
    9.62 +                   'void', 
    9.63 +                   [])
    9.64      return
    9.65  
    9.66  def register_Ns3Vector_methods(root_module, cls):
    9.67      ## vector.h: ns3::Vector::Vector(ns3::Vector const & arg0) [copy constructor]
    9.68 -    cls.add_constructor([param('ns3::Vector&', 'arg0', is_const=True)], visibility='public')
    9.69 +    cls.add_constructor([param('ns3::Vector&', 'arg0', is_const=True)])
    9.70      ## vector.h: ns3::Vector::Vector(double _x, double _y, double _z) [constructor]
    9.71 -    cls.add_constructor([param('double', '_x'), param('double', '_y'), param('double', '_z')], visibility='public')
    9.72 +    cls.add_constructor([param('double', '_x'), param('double', '_y'), param('double', '_z')])
    9.73      ## vector.h: ns3::Vector::Vector() [constructor]
    9.74 -    cls.add_constructor([], visibility='public')
    9.75 +    cls.add_constructor([])
    9.76      ## vector.h: ns3::Vector::x [variable]
    9.77      cls.add_instance_attribute('x', 'double', is_const=False)
    9.78      ## vector.h: ns3::Vector::y [variable]
    9.79 @@ -161,17 +180,26 @@
    9.80  
    9.81  def register_Ns3Rectangle_methods(root_module, cls):
    9.82      ## rectangle.h: ns3::Rectangle::Rectangle(ns3::Rectangle const & arg0) [copy constructor]
    9.83 -    cls.add_constructor([param('ns3::Rectangle&', 'arg0', is_const=True)], visibility='public')
    9.84 +    cls.add_constructor([param('ns3::Rectangle&', 'arg0', is_const=True)])
    9.85      ## rectangle.h: ns3::Rectangle::Rectangle(double _xMin, double _xMax, double _yMin, double _yMax) [constructor]
    9.86 -    cls.add_constructor([param('double', '_xMin'), param('double', '_xMax'), param('double', '_yMin'), param('double', '_yMax')], visibility='public')
    9.87 +    cls.add_constructor([param('double', '_xMin'), param('double', '_xMax'), param('double', '_yMin'), param('double', '_yMax')])
    9.88      ## rectangle.h: ns3::Rectangle::Rectangle() [constructor]
    9.89 -    cls.add_constructor([], visibility='public')
    9.90 +    cls.add_constructor([])
    9.91      ## rectangle.h: ns3::Vector ns3::Rectangle::CalculateIntersection(ns3::Vector const & current, ns3::Vector const & speed) const [member function]
    9.92 -    cls.add_method('CalculateIntersection', 'ns3::Vector', [param('ns3::Vector&', 'current', is_const=True), param('ns3::Vector&', 'speed', is_const=True)], is_const=True)
    9.93 +    cls.add_method('CalculateIntersection', 
    9.94 +                   'ns3::Vector', 
    9.95 +                   [param('ns3::Vector&', 'current', is_const=True), param('ns3::Vector&', 'speed', is_const=True)], 
    9.96 +                   is_const=True)
    9.97      ## rectangle.h: ns3::Rectangle::Side ns3::Rectangle::GetClosestSide(ns3::Vector const & position) const [member function]
    9.98 -    cls.add_method('GetClosestSide', 'ns3::Rectangle::Side', [param('ns3::Vector&', 'position', is_const=True)], is_const=True)
    9.99 +    cls.add_method('GetClosestSide', 
   9.100 +                   'ns3::Rectangle::Side', 
   9.101 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.102 +                   is_const=True)
   9.103      ## rectangle.h: bool ns3::Rectangle::IsInside(ns3::Vector const & position) const [member function]
   9.104 -    cls.add_method('IsInside', 'bool', [param('ns3::Vector&', 'position', is_const=True)], is_const=True)
   9.105 +    cls.add_method('IsInside', 
   9.106 +                   'bool', 
   9.107 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.108 +                   is_const=True)
   9.109      ## rectangle.h: ns3::Rectangle::xMax [variable]
   9.110      cls.add_instance_attribute('xMax', 'double', is_const=False)
   9.111      ## rectangle.h: ns3::Rectangle::xMin [variable]
   9.112 @@ -185,240 +213,460 @@
   9.113  
   9.114  def register_Ns3PositionAllocator_methods(root_module, cls):
   9.115      ## position-allocator.h: static ns3::TypeId ns3::PositionAllocator::GetTypeId() [member function]
   9.116 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.117 +    cls.add_method('GetTypeId', 
   9.118 +                   'ns3::TypeId', 
   9.119 +                   [], 
   9.120 +                   is_static=True)
   9.121      ## position-allocator.h: ns3::PositionAllocator::PositionAllocator() [constructor]
   9.122 -    cls.add_constructor([], visibility='public')
   9.123 +    cls.add_constructor([])
   9.124      ## position-allocator.h: ns3::Vector ns3::PositionAllocator::GetNext() const [member function]
   9.125 -    cls.add_method('GetNext', 'ns3::Vector', [], is_pure_virtual=True, is_const=True, is_virtual=True)
   9.126 +    cls.add_method('GetNext', 
   9.127 +                   'ns3::Vector', 
   9.128 +                   [], 
   9.129 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   9.130      return
   9.131  
   9.132  def register_Ns3ListPositionAllocator_methods(root_module, cls):
   9.133      ## position-allocator.h: static ns3::TypeId ns3::ListPositionAllocator::GetTypeId() [member function]
   9.134 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.135 +    cls.add_method('GetTypeId', 
   9.136 +                   'ns3::TypeId', 
   9.137 +                   [], 
   9.138 +                   is_static=True)
   9.139      ## position-allocator.h: ns3::ListPositionAllocator::ListPositionAllocator() [constructor]
   9.140 -    cls.add_constructor([], visibility='public')
   9.141 +    cls.add_constructor([])
   9.142      ## position-allocator.h: void ns3::ListPositionAllocator::Add(ns3::Vector v) [member function]
   9.143 -    cls.add_method('Add', 'void', [param('ns3::Vector', 'v')])
   9.144 +    cls.add_method('Add', 
   9.145 +                   'void', 
   9.146 +                   [param('ns3::Vector', 'v')])
   9.147      ## position-allocator.h: ns3::Vector ns3::ListPositionAllocator::GetNext() const [member function]
   9.148 -    cls.add_method('GetNext', 'ns3::Vector', [], is_const=True, is_virtual=True)
   9.149 +    cls.add_method('GetNext', 
   9.150 +                   'ns3::Vector', 
   9.151 +                   [], 
   9.152 +                   is_const=True, is_virtual=True)
   9.153      return
   9.154  
   9.155  def register_Ns3RectangleValue_methods(root_module, cls):
   9.156      ## rectangle.h: ns3::RectangleValue::RectangleValue() [constructor]
   9.157 -    cls.add_constructor([], visibility='public')
   9.158 +    cls.add_constructor([])
   9.159      ## rectangle.h: ns3::RectangleValue::RectangleValue(ns3::Rectangle const & value) [constructor]
   9.160 -    cls.add_constructor([param('ns3::Rectangle&', 'value', is_const=True)], visibility='public')
   9.161 +    cls.add_constructor([param('ns3::Rectangle&', 'value', is_const=True)])
   9.162      ## rectangle.h: void ns3::RectangleValue::Set(ns3::Rectangle const & value) [member function]
   9.163 -    cls.add_method('Set', 'void', [param('ns3::Rectangle&', 'value', is_const=True)])
   9.164 +    cls.add_method('Set', 
   9.165 +                   'void', 
   9.166 +                   [param('ns3::Rectangle&', 'value', is_const=True)])
   9.167      ## rectangle.h: ns3::Rectangle ns3::RectangleValue::Get() const [member function]
   9.168 -    cls.add_method('Get', 'ns3::Rectangle', [], is_const=True)
   9.169 +    cls.add_method('Get', 
   9.170 +                   'ns3::Rectangle', 
   9.171 +                   [], 
   9.172 +                   is_const=True)
   9.173      ## rectangle.h: ns3::Ptr<ns3::AttributeValue> ns3::RectangleValue::Copy() const [member function]
   9.174 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
   9.175 +    cls.add_method('Copy', 
   9.176 +                   'ns3::Ptr< ns3::AttributeValue >', 
   9.177 +                   [], 
   9.178 +                   is_const=True, is_virtual=True)
   9.179      ## rectangle.h: std::string ns3::RectangleValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
   9.180 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
   9.181 +    cls.add_method('SerializeToString', 
   9.182 +                   'std::string', 
   9.183 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   9.184 +                   is_const=True, is_virtual=True)
   9.185      ## rectangle.h: bool ns3::RectangleValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
   9.186 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
   9.187 +    cls.add_method('DeserializeFromString', 
   9.188 +                   'bool', 
   9.189 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   9.190 +                   is_virtual=True)
   9.191      return
   9.192  
   9.193  def register_Ns3RandomRectanglePositionAllocator_methods(root_module, cls):
   9.194      ## position-allocator.h: static ns3::TypeId ns3::RandomRectanglePositionAllocator::GetTypeId() [member function]
   9.195 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.196 +    cls.add_method('GetTypeId', 
   9.197 +                   'ns3::TypeId', 
   9.198 +                   [], 
   9.199 +                   is_static=True)
   9.200      ## position-allocator.h: ns3::RandomRectanglePositionAllocator::RandomRectanglePositionAllocator() [constructor]
   9.201 -    cls.add_constructor([], visibility='public')
   9.202 +    cls.add_constructor([])
   9.203      ## position-allocator.h: void ns3::RandomRectanglePositionAllocator::SetX(ns3::RandomVariable x) [member function]
   9.204 -    cls.add_method('SetX', 'void', [param('ns3::RandomVariable', 'x')])
   9.205 +    cls.add_method('SetX', 
   9.206 +                   'void', 
   9.207 +                   [param('ns3::RandomVariable', 'x')])
   9.208      ## position-allocator.h: void ns3::RandomRectanglePositionAllocator::SetY(ns3::RandomVariable y) [member function]
   9.209 -    cls.add_method('SetY', 'void', [param('ns3::RandomVariable', 'y')])
   9.210 +    cls.add_method('SetY', 
   9.211 +                   'void', 
   9.212 +                   [param('ns3::RandomVariable', 'y')])
   9.213      ## position-allocator.h: ns3::Vector ns3::RandomRectanglePositionAllocator::GetNext() const [member function]
   9.214 -    cls.add_method('GetNext', 'ns3::Vector', [], is_const=True, is_virtual=True)
   9.215 +    cls.add_method('GetNext', 
   9.216 +                   'ns3::Vector', 
   9.217 +                   [], 
   9.218 +                   is_const=True, is_virtual=True)
   9.219      return
   9.220  
   9.221  def register_Ns3VectorValue_methods(root_module, cls):
   9.222      ## vector.h: ns3::VectorValue::VectorValue() [constructor]
   9.223 -    cls.add_constructor([], visibility='public')
   9.224 +    cls.add_constructor([])
   9.225      ## vector.h: ns3::VectorValue::VectorValue(ns3::Vector const & value) [constructor]
   9.226 -    cls.add_constructor([param('ns3::Vector&', 'value', is_const=True)], visibility='public')
   9.227 +    cls.add_constructor([param('ns3::Vector&', 'value', is_const=True)])
   9.228      ## vector.h: void ns3::VectorValue::Set(ns3::Vector const & value) [member function]
   9.229 -    cls.add_method('Set', 'void', [param('ns3::Vector&', 'value', is_const=True)])
   9.230 +    cls.add_method('Set', 
   9.231 +                   'void', 
   9.232 +                   [param('ns3::Vector&', 'value', is_const=True)])
   9.233      ## vector.h: ns3::Vector ns3::VectorValue::Get() const [member function]
   9.234 -    cls.add_method('Get', 'ns3::Vector', [], is_const=True)
   9.235 +    cls.add_method('Get', 
   9.236 +                   'ns3::Vector', 
   9.237 +                   [], 
   9.238 +                   is_const=True)
   9.239      ## vector.h: ns3::Ptr<ns3::AttributeValue> ns3::VectorValue::Copy() const [member function]
   9.240 -    cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True)
   9.241 +    cls.add_method('Copy', 
   9.242 +                   'ns3::Ptr< ns3::AttributeValue >', 
   9.243 +                   [], 
   9.244 +                   is_const=True, is_virtual=True)
   9.245      ## vector.h: std::string ns3::VectorValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
   9.246 -    cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True)
   9.247 +    cls.add_method('SerializeToString', 
   9.248 +                   'std::string', 
   9.249 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   9.250 +                   is_const=True, is_virtual=True)
   9.251      ## vector.h: bool ns3::VectorValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
   9.252 -    cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True)
   9.253 +    cls.add_method('DeserializeFromString', 
   9.254 +                   'bool', 
   9.255 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   9.256 +                   is_virtual=True)
   9.257      return
   9.258  
   9.259  def register_Ns3RandomDiscPositionAllocator_methods(root_module, cls):
   9.260      ## position-allocator.h: static ns3::TypeId ns3::RandomDiscPositionAllocator::GetTypeId() [member function]
   9.261 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.262 +    cls.add_method('GetTypeId', 
   9.263 +                   'ns3::TypeId', 
   9.264 +                   [], 
   9.265 +                   is_static=True)
   9.266      ## position-allocator.h: ns3::RandomDiscPositionAllocator::RandomDiscPositionAllocator() [constructor]
   9.267 -    cls.add_constructor([], visibility='public')
   9.268 +    cls.add_constructor([])
   9.269      ## position-allocator.h: void ns3::RandomDiscPositionAllocator::SetTheta(ns3::RandomVariable theta) [member function]
   9.270 -    cls.add_method('SetTheta', 'void', [param('ns3::RandomVariable', 'theta')])
   9.271 +    cls.add_method('SetTheta', 
   9.272 +                   'void', 
   9.273 +                   [param('ns3::RandomVariable', 'theta')])
   9.274      ## position-allocator.h: void ns3::RandomDiscPositionAllocator::SetRho(ns3::RandomVariable rho) [member function]
   9.275 -    cls.add_method('SetRho', 'void', [param('ns3::RandomVariable', 'rho')])
   9.276 +    cls.add_method('SetRho', 
   9.277 +                   'void', 
   9.278 +                   [param('ns3::RandomVariable', 'rho')])
   9.279      ## position-allocator.h: void ns3::RandomDiscPositionAllocator::SetX(double x) [member function]
   9.280 -    cls.add_method('SetX', 'void', [param('double', 'x')])
   9.281 +    cls.add_method('SetX', 
   9.282 +                   'void', 
   9.283 +                   [param('double', 'x')])
   9.284      ## position-allocator.h: void ns3::RandomDiscPositionAllocator::SetY(double y) [member function]
   9.285 -    cls.add_method('SetY', 'void', [param('double', 'y')])
   9.286 +    cls.add_method('SetY', 
   9.287 +                   'void', 
   9.288 +                   [param('double', 'y')])
   9.289      ## position-allocator.h: ns3::Vector ns3::RandomDiscPositionAllocator::GetNext() const [member function]
   9.290 -    cls.add_method('GetNext', 'ns3::Vector', [], is_const=True, is_virtual=True)
   9.291 +    cls.add_method('GetNext', 
   9.292 +                   'ns3::Vector', 
   9.293 +                   [], 
   9.294 +                   is_const=True, is_virtual=True)
   9.295      return
   9.296  
   9.297  def register_Ns3MobilityModel_methods(root_module, cls):
   9.298      ## mobility-model.h: static ns3::TypeId ns3::MobilityModel::GetTypeId() [member function]
   9.299 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.300 +    cls.add_method('GetTypeId', 
   9.301 +                   'ns3::TypeId', 
   9.302 +                   [], 
   9.303 +                   is_static=True)
   9.304      ## mobility-model.h: ns3::MobilityModel::MobilityModel() [constructor]
   9.305 -    cls.add_constructor([], visibility='public')
   9.306 +    cls.add_constructor([])
   9.307      ## mobility-model.h: ns3::Vector ns3::MobilityModel::GetPosition() const [member function]
   9.308 -    cls.add_method('GetPosition', 'ns3::Vector', [], is_const=True)
   9.309 +    cls.add_method('GetPosition', 
   9.310 +                   'ns3::Vector', 
   9.311 +                   [], 
   9.312 +                   is_const=True)
   9.313      ## mobility-model.h: void ns3::MobilityModel::SetPosition(ns3::Vector const & position) [member function]
   9.314 -    cls.add_method('SetPosition', 'void', [param('ns3::Vector&', 'position', is_const=True)])
   9.315 +    cls.add_method('SetPosition', 
   9.316 +                   'void', 
   9.317 +                   [param('ns3::Vector&', 'position', is_const=True)])
   9.318      ## mobility-model.h: ns3::Vector ns3::MobilityModel::GetVelocity() const [member function]
   9.319 -    cls.add_method('GetVelocity', 'ns3::Vector', [], is_const=True)
   9.320 +    cls.add_method('GetVelocity', 
   9.321 +                   'ns3::Vector', 
   9.322 +                   [], 
   9.323 +                   is_const=True)
   9.324      ## mobility-model.h: double ns3::MobilityModel::GetDistanceFrom(ns3::Ptr<const ns3::MobilityModel> position) const [member function]
   9.325 -    cls.add_method('GetDistanceFrom', 'double', [param('ns3::Ptr< const ns3::MobilityModel >', 'position')], is_const=True)
   9.326 +    cls.add_method('GetDistanceFrom', 
   9.327 +                   'double', 
   9.328 +                   [param('ns3::Ptr< const ns3::MobilityModel >', 'position')], 
   9.329 +                   is_const=True)
   9.330      ## mobility-model.h: void ns3::MobilityModel::NotifyCourseChange() const [member function]
   9.331 -    cls.add_method('NotifyCourseChange', 'void', [], is_const=True, visibility='protected')
   9.332 +    cls.add_method('NotifyCourseChange', 
   9.333 +                   'void', 
   9.334 +                   [], 
   9.335 +                   is_const=True, visibility='protected')
   9.336      ## mobility-model.h: ns3::Vector ns3::MobilityModel::DoGetPosition() const [member function]
   9.337 -    cls.add_method('DoGetPosition', 'ns3::Vector', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
   9.338 +    cls.add_method('DoGetPosition', 
   9.339 +                   'ns3::Vector', 
   9.340 +                   [], 
   9.341 +                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
   9.342      ## mobility-model.h: void ns3::MobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   9.343 -    cls.add_method('DoSetPosition', 'void', [param('ns3::Vector&', 'position', is_const=True)], is_pure_virtual=True, visibility='private', is_virtual=True)
   9.344 +    cls.add_method('DoSetPosition', 
   9.345 +                   'void', 
   9.346 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.347 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
   9.348      ## mobility-model.h: ns3::Vector ns3::MobilityModel::DoGetVelocity() const [member function]
   9.349 -    cls.add_method('DoGetVelocity', 'ns3::Vector', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
   9.350 +    cls.add_method('DoGetVelocity', 
   9.351 +                   'ns3::Vector', 
   9.352 +                   [], 
   9.353 +                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
   9.354      return
   9.355  
   9.356  def register_Ns3RandomDirection2dMobilityModel_methods(root_module, cls):
   9.357      ## random-direction-2d-mobility-model.h: static ns3::TypeId ns3::RandomDirection2dMobilityModel::GetTypeId() [member function]
   9.358 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.359 +    cls.add_method('GetTypeId', 
   9.360 +                   'ns3::TypeId', 
   9.361 +                   [], 
   9.362 +                   is_static=True)
   9.363      ## random-direction-2d-mobility-model.h: ns3::RandomDirection2dMobilityModel::RandomDirection2dMobilityModel() [constructor]
   9.364 -    cls.add_constructor([], visibility='public')
   9.365 +    cls.add_constructor([])
   9.366      ## random-direction-2d-mobility-model.h: void ns3::RandomDirection2dMobilityModel::DoDispose() [member function]
   9.367 -    cls.add_method('DoDispose', 'void', [], visibility='private', is_virtual=True)
   9.368 +    cls.add_method('DoDispose', 
   9.369 +                   'void', 
   9.370 +                   [], 
   9.371 +                   visibility='private', is_virtual=True)
   9.372      ## random-direction-2d-mobility-model.h: ns3::Vector ns3::RandomDirection2dMobilityModel::DoGetPosition() const [member function]
   9.373 -    cls.add_method('DoGetPosition', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.374 +    cls.add_method('DoGetPosition', 
   9.375 +                   'ns3::Vector', 
   9.376 +                   [], 
   9.377 +                   is_const=True, visibility='private', is_virtual=True)
   9.378      ## random-direction-2d-mobility-model.h: void ns3::RandomDirection2dMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   9.379 -    cls.add_method('DoSetPosition', 'void', [param('ns3::Vector&', 'position', is_const=True)], visibility='private', is_virtual=True)
   9.380 +    cls.add_method('DoSetPosition', 
   9.381 +                   'void', 
   9.382 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.383 +                   visibility='private', is_virtual=True)
   9.384      ## random-direction-2d-mobility-model.h: ns3::Vector ns3::RandomDirection2dMobilityModel::DoGetVelocity() const [member function]
   9.385 -    cls.add_method('DoGetVelocity', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.386 +    cls.add_method('DoGetVelocity', 
   9.387 +                   'ns3::Vector', 
   9.388 +                   [], 
   9.389 +                   is_const=True, visibility='private', is_virtual=True)
   9.390      return
   9.391  
   9.392  def register_Ns3GridPositionAllocator_methods(root_module, cls):
   9.393      ## position-allocator.h: static ns3::TypeId ns3::GridPositionAllocator::GetTypeId() [member function]
   9.394 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.395 +    cls.add_method('GetTypeId', 
   9.396 +                   'ns3::TypeId', 
   9.397 +                   [], 
   9.398 +                   is_static=True)
   9.399      ## position-allocator.h: ns3::GridPositionAllocator::GridPositionAllocator() [constructor]
   9.400 -    cls.add_constructor([], visibility='public')
   9.401 +    cls.add_constructor([])
   9.402      ## position-allocator.h: void ns3::GridPositionAllocator::SetMinX(double xMin) [member function]
   9.403 -    cls.add_method('SetMinX', 'void', [param('double', 'xMin')])
   9.404 +    cls.add_method('SetMinX', 
   9.405 +                   'void', 
   9.406 +                   [param('double', 'xMin')])
   9.407      ## position-allocator.h: void ns3::GridPositionAllocator::SetMinY(double yMin) [member function]
   9.408 -    cls.add_method('SetMinY', 'void', [param('double', 'yMin')])
   9.409 +    cls.add_method('SetMinY', 
   9.410 +                   'void', 
   9.411 +                   [param('double', 'yMin')])
   9.412      ## position-allocator.h: void ns3::GridPositionAllocator::SetDeltaX(double deltaX) [member function]
   9.413 -    cls.add_method('SetDeltaX', 'void', [param('double', 'deltaX')])
   9.414 +    cls.add_method('SetDeltaX', 
   9.415 +                   'void', 
   9.416 +                   [param('double', 'deltaX')])
   9.417      ## position-allocator.h: void ns3::GridPositionAllocator::SetDeltaY(double deltaY) [member function]
   9.418 -    cls.add_method('SetDeltaY', 'void', [param('double', 'deltaY')])
   9.419 +    cls.add_method('SetDeltaY', 
   9.420 +                   'void', 
   9.421 +                   [param('double', 'deltaY')])
   9.422      ## position-allocator.h: void ns3::GridPositionAllocator::SetN(uint32_t n) [member function]
   9.423 -    cls.add_method('SetN', 'void', [param('uint32_t', 'n')])
   9.424 +    cls.add_method('SetN', 
   9.425 +                   'void', 
   9.426 +                   [param('uint32_t', 'n')])
   9.427      ## position-allocator.h: void ns3::GridPositionAllocator::SetLayoutType(ns3::GridPositionAllocator::LayoutType layoutType) [member function]
   9.428 -    cls.add_method('SetLayoutType', 'void', [param('ns3::GridPositionAllocator::LayoutType', 'layoutType')])
   9.429 +    cls.add_method('SetLayoutType', 
   9.430 +                   'void', 
   9.431 +                   [param('ns3::GridPositionAllocator::LayoutType', 'layoutType')])
   9.432      ## position-allocator.h: double ns3::GridPositionAllocator::GetMinX() const [member function]
   9.433 -    cls.add_method('GetMinX', 'double', [], is_const=True)
   9.434 +    cls.add_method('GetMinX', 
   9.435 +                   'double', 
   9.436 +                   [], 
   9.437 +                   is_const=True)
   9.438      ## position-allocator.h: double ns3::GridPositionAllocator::GetMinY() const [member function]
   9.439 -    cls.add_method('GetMinY', 'double', [], is_const=True)
   9.440 +    cls.add_method('GetMinY', 
   9.441 +                   'double', 
   9.442 +                   [], 
   9.443 +                   is_const=True)
   9.444      ## position-allocator.h: double ns3::GridPositionAllocator::GetDeltaX() const [member function]
   9.445 -    cls.add_method('GetDeltaX', 'double', [], is_const=True)
   9.446 +    cls.add_method('GetDeltaX', 
   9.447 +                   'double', 
   9.448 +                   [], 
   9.449 +                   is_const=True)
   9.450      ## position-allocator.h: double ns3::GridPositionAllocator::GetDeltaY() const [member function]
   9.451 -    cls.add_method('GetDeltaY', 'double', [], is_const=True)
   9.452 +    cls.add_method('GetDeltaY', 
   9.453 +                   'double', 
   9.454 +                   [], 
   9.455 +                   is_const=True)
   9.456      ## position-allocator.h: uint32_t ns3::GridPositionAllocator::GetN() const [member function]
   9.457 -    cls.add_method('GetN', 'uint32_t', [], is_const=True)
   9.458 +    cls.add_method('GetN', 
   9.459 +                   'uint32_t', 
   9.460 +                   [], 
   9.461 +                   is_const=True)
   9.462      ## position-allocator.h: ns3::GridPositionAllocator::LayoutType ns3::GridPositionAllocator::GetLayoutType() const [member function]
   9.463 -    cls.add_method('GetLayoutType', 'ns3::GridPositionAllocator::LayoutType', [], is_const=True)
   9.464 +    cls.add_method('GetLayoutType', 
   9.465 +                   'ns3::GridPositionAllocator::LayoutType', 
   9.466 +                   [], 
   9.467 +                   is_const=True)
   9.468      ## position-allocator.h: ns3::Vector ns3::GridPositionAllocator::GetNext() const [member function]
   9.469 -    cls.add_method('GetNext', 'ns3::Vector', [], is_const=True, is_virtual=True)
   9.470 +    cls.add_method('GetNext', 
   9.471 +                   'ns3::Vector', 
   9.472 +                   [], 
   9.473 +                   is_const=True, is_virtual=True)
   9.474      return
   9.475  
   9.476  def register_Ns3RandomWaypointMobilityModel_methods(root_module, cls):
   9.477      ## random-waypoint-mobility-model.h: static ns3::TypeId ns3::RandomWaypointMobilityModel::GetTypeId() [member function]
   9.478 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.479 +    cls.add_method('GetTypeId', 
   9.480 +                   'ns3::TypeId', 
   9.481 +                   [], 
   9.482 +                   is_static=True)
   9.483      ## random-waypoint-mobility-model.h: ns3::RandomWaypointMobilityModel::RandomWaypointMobilityModel() [constructor]
   9.484 -    cls.add_constructor([], visibility='public')
   9.485 +    cls.add_constructor([])
   9.486      ## random-waypoint-mobility-model.h: ns3::Vector ns3::RandomWaypointMobilityModel::DoGetPosition() const [member function]
   9.487 -    cls.add_method('DoGetPosition', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.488 +    cls.add_method('DoGetPosition', 
   9.489 +                   'ns3::Vector', 
   9.490 +                   [], 
   9.491 +                   is_const=True, visibility='private', is_virtual=True)
   9.492      ## random-waypoint-mobility-model.h: void ns3::RandomWaypointMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   9.493 -    cls.add_method('DoSetPosition', 'void', [param('ns3::Vector&', 'position', is_const=True)], visibility='private', is_virtual=True)
   9.494 +    cls.add_method('DoSetPosition', 
   9.495 +                   'void', 
   9.496 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.497 +                   visibility='private', is_virtual=True)
   9.498      ## random-waypoint-mobility-model.h: ns3::Vector ns3::RandomWaypointMobilityModel::DoGetVelocity() const [member function]
   9.499 -    cls.add_method('DoGetVelocity', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.500 +    cls.add_method('DoGetVelocity', 
   9.501 +                   'ns3::Vector', 
   9.502 +                   [], 
   9.503 +                   is_const=True, visibility='private', is_virtual=True)
   9.504      return
   9.505  
   9.506  def register_Ns3RandomWalk2dMobilityModel_methods(root_module, cls):
   9.507      ## random-walk-2d-mobility-model.h: static ns3::TypeId ns3::RandomWalk2dMobilityModel::GetTypeId() [member function]
   9.508 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.509 +    cls.add_method('GetTypeId', 
   9.510 +                   'ns3::TypeId', 
   9.511 +                   [], 
   9.512 +                   is_static=True)
   9.513      ## random-walk-2d-mobility-model.h: ns3::RandomWalk2dMobilityModel::RandomWalk2dMobilityModel() [constructor]
   9.514 -    cls.add_constructor([], visibility='public')
   9.515 +    cls.add_constructor([])
   9.516      ## random-walk-2d-mobility-model.h: void ns3::RandomWalk2dMobilityModel::DoDispose() [member function]
   9.517 -    cls.add_method('DoDispose', 'void', [], visibility='private', is_virtual=True)
   9.518 +    cls.add_method('DoDispose', 
   9.519 +                   'void', 
   9.520 +                   [], 
   9.521 +                   visibility='private', is_virtual=True)
   9.522      ## random-walk-2d-mobility-model.h: ns3::Vector ns3::RandomWalk2dMobilityModel::DoGetPosition() const [member function]
   9.523 -    cls.add_method('DoGetPosition', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.524 +    cls.add_method('DoGetPosition', 
   9.525 +                   'ns3::Vector', 
   9.526 +                   [], 
   9.527 +                   is_const=True, visibility='private', is_virtual=True)
   9.528      ## random-walk-2d-mobility-model.h: void ns3::RandomWalk2dMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   9.529 -    cls.add_method('DoSetPosition', 'void', [param('ns3::Vector&', 'position', is_const=True)], visibility='private', is_virtual=True)
   9.530 +    cls.add_method('DoSetPosition', 
   9.531 +                   'void', 
   9.532 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.533 +                   visibility='private', is_virtual=True)
   9.534      ## random-walk-2d-mobility-model.h: ns3::Vector ns3::RandomWalk2dMobilityModel::DoGetVelocity() const [member function]
   9.535 -    cls.add_method('DoGetVelocity', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.536 +    cls.add_method('DoGetVelocity', 
   9.537 +                   'ns3::Vector', 
   9.538 +                   [], 
   9.539 +                   is_const=True, visibility='private', is_virtual=True)
   9.540      return
   9.541  
   9.542  def register_Ns3StaticSpeedMobilityModel_methods(root_module, cls):
   9.543      ## static-speed-mobility-model.h: static ns3::TypeId ns3::StaticSpeedMobilityModel::GetTypeId() [member function]
   9.544 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.545 +    cls.add_method('GetTypeId', 
   9.546 +                   'ns3::TypeId', 
   9.547 +                   [], 
   9.548 +                   is_static=True)
   9.549      ## static-speed-mobility-model.h: ns3::StaticSpeedMobilityModel::StaticSpeedMobilityModel() [constructor]
   9.550 -    cls.add_constructor([], visibility='public')
   9.551 +    cls.add_constructor([])
   9.552      ## static-speed-mobility-model.h: void ns3::StaticSpeedMobilityModel::SetSpeed(ns3::Vector const & speed) [member function]
   9.553 -    cls.add_method('SetSpeed', 'void', [param('ns3::Vector&', 'speed', is_const=True)])
   9.554 +    cls.add_method('SetSpeed', 
   9.555 +                   'void', 
   9.556 +                   [param('ns3::Vector&', 'speed', is_const=True)])
   9.557      ## static-speed-mobility-model.h: ns3::Vector ns3::StaticSpeedMobilityModel::DoGetPosition() const [member function]
   9.558 -    cls.add_method('DoGetPosition', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.559 +    cls.add_method('DoGetPosition', 
   9.560 +                   'ns3::Vector', 
   9.561 +                   [], 
   9.562 +                   is_const=True, visibility='private', is_virtual=True)
   9.563      ## static-speed-mobility-model.h: void ns3::StaticSpeedMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   9.564 -    cls.add_method('DoSetPosition', 'void', [param('ns3::Vector&', 'position', is_const=True)], visibility='private', is_virtual=True)
   9.565 +    cls.add_method('DoSetPosition', 
   9.566 +                   'void', 
   9.567 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.568 +                   visibility='private', is_virtual=True)
   9.569      ## static-speed-mobility-model.h: ns3::Vector ns3::StaticSpeedMobilityModel::DoGetVelocity() const [member function]
   9.570 -    cls.add_method('DoGetVelocity', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.571 +    cls.add_method('DoGetVelocity', 
   9.572 +                   'ns3::Vector', 
   9.573 +                   [], 
   9.574 +                   is_const=True, visibility='private', is_virtual=True)
   9.575      return
   9.576  
   9.577  def register_Ns3HierarchicalMobilityModel_methods(root_module, cls):
   9.578      ## hierarchical-mobility-model.h: static ns3::TypeId ns3::HierarchicalMobilityModel::GetTypeId() [member function]
   9.579 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.580 +    cls.add_method('GetTypeId', 
   9.581 +                   'ns3::TypeId', 
   9.582 +                   [], 
   9.583 +                   is_static=True)
   9.584      ## hierarchical-mobility-model.h: ns3::HierarchicalMobilityModel::HierarchicalMobilityModel() [constructor]
   9.585 -    cls.add_constructor([], visibility='public')
   9.586 +    cls.add_constructor([])
   9.587      ## hierarchical-mobility-model.h: ns3::Ptr<ns3::MobilityModel> ns3::HierarchicalMobilityModel::GetChild() const [member function]
   9.588 -    cls.add_method('GetChild', 'ns3::Ptr< ns3::MobilityModel >', [], is_const=True)
   9.589 +    cls.add_method('GetChild', 
   9.590 +                   'ns3::Ptr< ns3::MobilityModel >', 
   9.591 +                   [], 
   9.592 +                   is_const=True)
   9.593      ## hierarchical-mobility-model.h: ns3::Ptr<ns3::MobilityModel> ns3::HierarchicalMobilityModel::GetParent() const [member function]
   9.594 -    cls.add_method('GetParent', 'ns3::Ptr< ns3::MobilityModel >', [], is_const=True)
   9.595 +    cls.add_method('GetParent', 
   9.596 +                   'ns3::Ptr< ns3::MobilityModel >', 
   9.597 +                   [], 
   9.598 +                   is_const=True)
   9.599      ## hierarchical-mobility-model.h: ns3::Vector ns3::HierarchicalMobilityModel::DoGetPosition() const [member function]
   9.600 -    cls.add_method('DoGetPosition', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.601 +    cls.add_method('DoGetPosition', 
   9.602 +                   'ns3::Vector', 
   9.603 +                   [], 
   9.604 +                   is_const=True, visibility='private', is_virtual=True)
   9.605      ## hierarchical-mobility-model.h: void ns3::HierarchicalMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   9.606 -    cls.add_method('DoSetPosition', 'void', [param('ns3::Vector&', 'position', is_const=True)], visibility='private', is_virtual=True)
   9.607 +    cls.add_method('DoSetPosition', 
   9.608 +                   'void', 
   9.609 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.610 +                   visibility='private', is_virtual=True)
   9.611      ## hierarchical-mobility-model.h: ns3::Vector ns3::HierarchicalMobilityModel::DoGetVelocity() const [member function]
   9.612 -    cls.add_method('DoGetVelocity', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.613 +    cls.add_method('DoGetVelocity', 
   9.614 +                   'ns3::Vector', 
   9.615 +                   [], 
   9.616 +                   is_const=True, visibility='private', is_virtual=True)
   9.617      return
   9.618  
   9.619  def register_Ns3StaticMobilityModel_methods(root_module, cls):
   9.620      ## static-mobility-model.h: static ns3::TypeId ns3::StaticMobilityModel::GetTypeId() [member function]
   9.621 -    cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True)
   9.622 +    cls.add_method('GetTypeId', 
   9.623 +                   'ns3::TypeId', 
   9.624 +                   [], 
   9.625 +                   is_static=True)
   9.626      ## static-mobility-model.h: ns3::StaticMobilityModel::StaticMobilityModel() [constructor]
   9.627 -    cls.add_constructor([], visibility='public')
   9.628 +    cls.add_constructor([])
   9.629      ## static-mobility-model.h: ns3::Vector ns3::StaticMobilityModel::DoGetPosition() const [member function]
   9.630 -    cls.add_method('DoGetPosition', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.631 +    cls.add_method('DoGetPosition', 
   9.632 +                   'ns3::Vector', 
   9.633 +                   [], 
   9.634 +                   is_const=True, visibility='private', is_virtual=True)
   9.635      ## static-mobility-model.h: void ns3::StaticMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   9.636 -    cls.add_method('DoSetPosition', 'void', [param('ns3::Vector&', 'position', is_const=True)], visibility='private', is_virtual=True)
   9.637 +    cls.add_method('DoSetPosition', 
   9.638 +                   'void', 
   9.639 +                   [param('ns3::Vector&', 'position', is_const=True)], 
   9.640 +                   visibility='private', is_virtual=True)
   9.641      ## static-mobility-model.h: ns3::Vector ns3::StaticMobilityModel::DoGetVelocity() const [member function]
   9.642 -    cls.add_method('DoGetVelocity', 'ns3::Vector', [], is_const=True, visibility='private', is_virtual=True)
   9.643 +    cls.add_method('DoGetVelocity', 
   9.644 +                   'ns3::Vector', 
   9.645 +                   [], 
   9.646 +                   is_const=True, visibility='private', is_virtual=True)
   9.647      return
   9.648  
   9.649  def register_functions(root_module):
   9.650      module = root_module
   9.651      ## rectangle.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeRectangleChecker() [free function]
   9.652 -    module.add_function('MakeRectangleChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [])
   9.653 +    module.add_function('MakeRectangleChecker', 
   9.654 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
   9.655 +                        [])
   9.656      ## vector.h: extern double ns3::CalculateDistance(ns3::Vector const & a, ns3::Vector const & b) [free function]
   9.657 -    module.add_function('CalculateDistance', 'double', [param('ns3::Vector&', 'a', is_const=True), param('ns3::Vector&', 'b', is_const=True)])
   9.658 +    module.add_function('CalculateDistance', 
   9.659 +                        'double', 
   9.660 +                        [param('ns3::Vector&', 'a', is_const=True), param('ns3::Vector&', 'b', is_const=True)])
   9.661      ## vector.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeVectorChecker() [free function]
   9.662 -    module.add_function('MakeVectorChecker', 'ns3::Ptr< ns3::AttributeChecker const >', [])
   9.663 +    module.add_function('MakeVectorChecker', 
   9.664 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
   9.665 +                        [])
   9.666      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   9.667      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   9.668      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
    10.1 --- a/bindings/python/ns3_module_node.py	Mon Jul 21 11:43:05 2008 +0100
    10.2 +++ b/bindings/python/ns3_module_node.py	Mon Jul 21 15:30:15 2008 +0100
    10.3 @@ -1,4 +1,4 @@
    10.4 -from pybindgen import Module, FileCodeSink, write_preamble, param, retval
    10.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    10.6  
    10.7  def register_types(module):
    10.8      root_module = module.get_root()
    10.9 @@ -193,49 +193,97 @@
   10.10  
   10.11  def register_Ns3NodeList_methods(root_module, cls):
   10.12      ## node-list.h: static uint32_t ns3::NodeList::Add(ns3::Ptr<ns3::Node> node) [member function]
   10.13 -    cls.add_method('Add', 'uint32_t', [param('ns3::Ptr< ns3::Node >', 'node')], is_static=True)
   10.14 +    cls.add_method('Add', 
   10.15 +                   'uint32_t', 
   10.16 +                   [param('ns3::Ptr< ns3::Node >', 'node')], 
   10.17 +                   is_static=True)
   10.18      ## node-list.h: static __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Node>*,std::vector<ns3::Ptr<ns3::Node>, std::allocator<ns3::Ptr<ns3::Node> > > > ns3::NodeList::Begin() [member function]
   10.19 -    cls.add_method('Begin', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Node >, std::vector< ns3::Ptr< ns3::Node >, std::allocator< ns3::Ptr< ns3::Node > > > >', [], is_static=True)
   10.20 +    cls.add_method('Begin', 
   10.21 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Node >, std::vector< ns3::Ptr< ns3::Node >, std::allocator< ns3::Ptr< ns3::Node > > > >', 
   10.22 +                   [], 
   10.23 +                   is_static=True)
   10.24      ## node-list.h: static __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Node>*,std::vector<ns3::Ptr<ns3::Node>, std::allocator<ns3::Ptr<ns3::Node> > > > ns3::NodeList::End() [member function]
   10.25 -    cls.add_method('End', '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Node >, std::vector< ns3::Ptr< ns3::Node >, std::allocator< ns3::Ptr< ns3::Node > > > >', [], is_static=True)
   10.26 +    cls.add_method('End', 
   10.27 +                   '__gnu_cxx::__normal_iterator< const ns3::Ptr< ns3::Node >, std::vector< ns3::Ptr< ns3::Node >, std::allocator< ns3::Ptr< ns3::Node > > > >', 
   10.28 +                   [], 
   10.29 +                   is_static=True)
   10.30      ## node-list.h: static ns3::Ptr<ns3::Node> ns3::NodeList::GetNode(uint32_t n) [member function]
   10.31 -    cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [param('uint32_t', 'n')], is_static=True)
   10.32 +    cls.add_method('GetNode', 
   10.33 +                   'ns3::Ptr< ns3::Node >', 
   10.34 +                   [param('uint32_t', 'n')], 
   10.35 +                   is_static=True)
   10.36      ## node-list.h: static uint32_t ns3::NodeList::GetNNodes() [member function]
   10.37 -    cls.add_method('GetNNodes', 'uint32_t', [], is_static=True)
   10.38 +    cls.add_method('GetNNodes', 
   10.39 +                   'uint32_t', 
   10.40 +                   [], 
   10.41 +                   is_static=True)
   10.42      cls.add_constructor([])
   10.43      return
   10.44  
   10.45  def register_Ns3Address_methods(root_module, cls):
   10.46      ## address.h: ns3::Address::Address() [constructor]
   10.47 -    cls.add_constructor([], visibility='public')
   10.48 +    cls.add_constructor([])
   10.49      ## address.h: ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor]
   10.50 -    cls.add_constructor([param('uint8_t', 'type'), param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint8_t', 'len')], visibility='public')
   10.51 +    cls.add_constructor([param('uint8_t', 'type'), param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint8_t', 'len')])
   10.52      ## address.h: ns3::Address::Address(ns3::Address const & address) [copy constructor]
   10.53 -    cls.add_constructor([param('ns3::Address&', 'address', is_const=True)], visibility='public')
   10.54 +    cls.add_constructor([param('ns3::Address&', 'address', is_const=True)])
   10.55      ## address.h: bool ns3::Address::CheckCompatible(uint8_t type, uint8_t len) const [member function]
   10.56 -    cls.add_method('CheckCompatible', 'bool', [param('uint8_t', 'type'), param('uint8_t', 'len')], is_const=True)
   10.57 +    cls.add_method('CheckCompatible', 
   10.58 +                   'bool', 
   10.59 +                   [param('uint8_t', 'type'), param('uint8_t', 'len')], 
   10.60 +                   is_const=True)
   10.61      ## address.h: uint32_t ns3::Address::CopyAllFrom(uint8_t const * buffer, uint8_t len) [member function]
   10.62 -    cls.add_method('CopyAllFrom', 'uint32_t', [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint8_t', 'len')])
   10.63 +    cls.add_method('CopyAllFrom', 
   10.64 +                   'uint32_t', 
   10.65 +                   [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint8_t', 'len')])
   10.66      ## address.h: uint32_t ns3::Address::CopyAllTo(uint8_t * buffer, uint8_t len) const [member function]
   10.67 -    cls.add_method('CopyAllTo', 'uint32_t', [param('uint8_t *', 'buffer'), param('uint8_t', 'len')], is_const=True)
   10.68 +    cls.add_method('CopyAllTo', 
   10.69 +                   'uint32_t', 
   10.70 +                   [param('uint8_t *', 'buffer'), param('uint8_t', 'len')], 
   10.71 +                   is_const=True)
   10.72      ## address.h: uint32_t ns3::Address::CopyFrom(uint8_t const * buffer, uint8_t len) [member function]
   10.73 -    cls.add_method('CopyFrom', 'uint32_t', [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint8_t', 'len')])
   10.74 +    cls.add_method('CopyFrom', 
   10.75 +                   'uint32_t', 
   10.76 +                   [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True), param('uint8_t', 'len')])
   10.77      ## address.h: uint32_t ns3::Address::CopyTo(uint8_t * buffer) const [member function]
   10.78 -    cls.add_method('CopyTo', 'uint32_t', [param('uint8_t *', 'buffer')], is_const=True)
   10.79 +    cls.add_method('CopyTo', 
   10.80 +                   'uint32_t', 
   10.81 +                   [param('uint8_t *', 'buffer')], 
   10.82 +                   is_const=True)
   10.83      ## address.h: void ns3::Address::Deserialize(ns3::TagBuffer buffer) [member function]
   10.84 -    cls.add_method('Deserialize', 'void', [param('ns3::TagBuffer', 'buffer')])
   10.85 +    cls.add_method('Deserialize', 
   10.86 +                   'void', 
   10.87 +                   [param('ns3::TagBuffer', 'buffer')])
   10.88      ## address.h: uint8_t ns3::Address::GetLength() const [member function]
   10.89 -    cls.add_method('GetLength', 'uint8_t', [], is_const=True)
   10.90 +    cls.add_method('GetLength', 
   10.91 +                   'uint8_t', 
   10.92 +                   [], 
   10.93 +                   is_const=True)
   10.94      ## address.h: uint32_t ns3::Address::GetSerializedSize() const [member function]
   10.95 -    cls.add_method('GetSerializedSize', 'uint32_t', [], is_const=True)
   10.96 +    cls.add_method('GetSerializedSize', 
   10.97 +                   'uint32_t', 
   10.98 +                   [], 
   10.99 +                   is_const=True)
  10.100      ## address.h: bool ns3::Address::IsInvalid() const [member function]
  10.101 -    cls.add_method('IsInvalid', 'bool', [], is_const=True)
  10.102 +    cls.add_method('IsInvalid', 
  10.103 +                   'bool', 
  10.104 +                   [], 
  10.105 +                   is_const=True)
  10.106      ## address.h: bool ns3::Address::IsMatchingType(uint8_t type) const [member function]
  10.107 -    cls.add_method('IsMatchingType', 'bool', [param('uint8_t', 'type')], is_const=True)
  10.108 +    cls.add_method('IsMatchingType', 
  10.109 +                   'bool', 
  10.110 +                   [param('uint8_t', 'type')], 
  10.111 +                   is_const=True)
  10.112      ## address.h: static uint8_t ns3::Address::Register() [member function]
  10.113 -    cls.add_method('Register', 'uint8_t', [], is_static=True)
  10.114 +    cls.add_method('Register', 
  10.115 +                   'uint8_t', 
  10.116 +                   [], 
  10.117 +                   is_static=True)
  10.118      ## address.h: void ns3::Address::Serialize(ns3::TagBuffer buffer) const [member function]
  10.119 -    cls.add_method('Serialize', 'void', [param('ns3::TagBuffer', 'buffer')], is_const=True)
  10.120 +    cls.add_method('Serialize', 
  10.121 +                   'void', 
  10.122 +                   [param('ns3::TagBuffer', 'buffer')], 
  10.123 +                   is_const=True)
  10.124      cls.add_output_stream_operator()
  10.125      return
  10.126  
  10.127 @@ -245,69 +293,133 @@
  10.128  
  10.129  def register_Ns3Mac48Address_methods(root_module, cls):
  10.130      ## mac48-address.h: ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
  10.131 -    cls.add_constructor([param('ns3::Mac48Address&', 'arg0', is_const=True)], visibility='public')
  10.132 +    cls.add_constructor([param('ns3::Mac48Address&', 'arg0', is_const=True)])
  10.133      ## mac48-address.h: ns3::Mac48Address::Mac48Address() [constructor]
  10.134 -    cls.add_constructor([], visibility='public')
  10.135 +    cls.add_constructor([])
  10.136      ## mac48-address.h: ns3::Mac48Address::Mac48Address(char const * str) [constructor]
  10.137 -    cls.add_constructor([param('char *', 'str', transfer_ownership=False, is_const=True)], visibility='public')
  10.138 +    cls.add_constructor([param('char *', 'str', transfer_ownership=False, is_const=True)])
  10.139      ## mac48-address.h: static ns3::Mac48Address ns3::Mac48Address::Allocate() [member function]
  10.140 -    cls.add_method('Allocate', 'ns3::Mac48Address', [], is_static=True)
  10.141 +    cls.add_method('Allocate', 
  10.142 +                   'ns3::Mac48Address', 
  10.143 +                   [], 
  10.144 +                   is_static=True)
  10.145      ## mac48-address.h: static ns3::Mac48Address ns3::Mac48Address::ConvertFrom(ns3::Address const & address) [member function]
  10.146 -    cls.add_method('ConvertFrom', 'ns3::Mac48Address', [param('ns3::Address&', 'address', is_const=True)], is_static=True)
  10.147 +    cls.add_method('ConvertFrom', 
  10.148 +                   'ns3::Mac48Address', 
  10.149 +                   [param('ns3::Address&', 'address', is_const=True)], 
  10.150 +                   is_static=True)
  10.151      ## mac48-address.h: void ns3::Mac48Address::CopyFrom(uint8_t const * buffer) [member function]
  10.152 -    cls.add_method('CopyFrom', 'void', [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True)])
  10.153 +    cls.add_method('CopyFrom', 
  10.154 +                   'void', 
  10.155 +                   [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True)])
  10.156      ## mac48-address.h: void ns3::Mac48Address::CopyTo(uint8_t * buffer) const [member function]
  10.157 -    cls.add_method('CopyTo', 'void', [param('uint8_t *', 'buffer')], is_const=True)
  10.158 +    cls.add_method('CopyTo', 
  10.159 +                   'void', 
  10.160 +                   [param('uint8_t *', 'buffer')], 
  10.161 +                   is_const=True)
  10.162      ## mac48-address.h: static ns3::Mac48Address ns3::Mac48Address::GetBroadcast() [member function]
  10.163 -    cls.add_method('GetBroadcast', 'ns3::Mac48Address', [], is_static=True)
  10.164 +    cls.add_method('GetBroadcast', 
  10.165 +                   'ns3::Mac48Address', 
  10.166 +                   [], 
  10.167 +                   is_static=True)
  10.168      ## mac48-address.h: bool ns3::Mac48Address::IsBroadcast() const [member function]
  10.169 -    cls.add_method('IsBroadcast', 'bool', [], is_const=True)
  10.170 +    cls.add_method('IsBroadcast', 
  10.171 +                   'bool', 
  10.172 +                   [], 
  10.173 +                   is_const=True)
  10.174      ## mac48-address.h: static bool ns3::Mac48Address::IsMatchingType(ns3::Address const & address) [member function]
  10.175 -    cls.add_method('IsMatchingType', 'bool', [param('ns3::Address&', 'address', is_const=True)], is_static=True)
  10.176 +    cls.add_method('IsMatchingType', 
  10.177 +                   'bool', 
  10.178 +                   [param('ns3::Address&', 'address', is_const=True)], 
  10.179 +                   is_static=True)
  10.180      ## mac48-address.h: bool ns3::Mac48Address::IsMulticast() const [member function]
  10.181 -    cls.add_method('IsMulticast', 'bool', [], is_const=True)
  10.182 +    cls.add_method('IsMulticast', 
  10.183 +                   'bool', 
  10.184 +                   [], 
  10.185 +                   is_const=True)
  10.186      cls.add_output_stream_operator()
  10.187      return
  10.188  
  10.189  def register_Ns3Mac64Address_methods(root_module, cls):
  10.190      ## mac64-address.h: ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor]
  10.191 -    cls.add_constructor([param('ns3::Mac64Address&', 'arg0', is_const=True)], visibility='public')
  10.192 +    cls.add_constructor([param('ns3::Mac64Address&', 'arg0', is_const=True)])
  10.193      ## mac64-address.h: ns3::Mac64Address::Mac64Address() [constructor]
  10.194 -    cls.add_constructor([], visibility='public')
  10.195 +    cls.add_constructor([])
  10.196      ## mac64-address.h: ns3::Mac64Address::Mac64Address(char const * str) [constructor]
  10.197 -    cls.add_constructor([param('char *', 'str', transfer_ownership=False, is_const=True)], visibility='public')
  10.198 +    cls.add_constructor([param('char *', 'str', transfer_ownership=False, is_const=True)])
  10.199      ## mac64-address.h: static ns3::Mac64Address ns3::Mac64Address::Allocate() [member function]
  10.200 -    cls.add_method('Allocate', 'ns3::Mac64Address', [], is_static=True)
  10.201 +    cls.add_method('Allocate', 
  10.202 +                   'ns3::Mac64Address', 
  10.203 +                   [], 
  10.204 +                   is_static=True)
  10.205      ## mac64-address.h: static ns3::Mac64Address ns3::Mac64Address::ConvertFrom(ns3::Address const & address) [member function]
  10.206 -    cls.add_method('ConvertFrom', 'ns3::Mac64Address', [param('ns3::Address&', 'address', is_const=True)], is_static=True)
  10.207 +    cls.add_method('ConvertFrom', 
  10.208 +                   'ns3::Mac64Address', 
  10.209 +                   [param('ns3::Address&', 'address', is_const=True)], 
  10.210 +                   is_static=True)
  10.211      ## mac64-address.h: void ns3::Mac64Address::CopyFrom(uint8_t const * buffer) [member function]
  10.212 -    cls.add_method('CopyFrom', 'void', [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True)])
  10.213 +    cls.add_method('CopyFrom', 
  10.214 +                   'void', 
  10.215 +                   [param('uint8_t *', 'buffer', transfer_ownership=False, is_const=True)])
  10.216      ## mac64-address.h: void ns3::Mac64Address::CopyTo(uint8_t * buffer) const [member function]
  10.217 -    cls.add_method('CopyTo', 'void', [param('uint8_t *', 'buffer')], is_const=True)
  10.218 +    cls.add_method('CopyTo', 
  10.219 +                   'void', 
  10.220 +                   [param('uint8_t *', 'buffer')], 
  10.221 +                   is_const=True)
  10.222      ## mac64-address.h: static bool ns3::Mac64Address::IsMatchingType(ns3::Address const & address) [member function]
  10.223 -    cls.add_method('IsMatchingType', 'bool', [param('ns3::Address&', 'address', is_const=True)], is_static=True)
  10.224 +    cls.add_method('IsMatchingType', 
  10.225 +                   'bool', 
  10.226 +                   [param('ns3::Address&', 'address', is_const=True)], 
  10.227 +                   is_static=True)
  10.228      cls.add_output_stream_operator()
  10.229      return
  10.230  
  10.231  def register_Ns3Ipv4AddressGenerator_methods(root_module, cls):
  10.232      ## ipv4-address-generator.h: static void ns3::Ipv4AddressGenerator::Init(ns3::Ipv4Address const net, ns3::Ipv4Mask const mask, ns3::Ipv4Address const addr="0.0.0.1") [member function]