F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup object registration for uan

Browse Source
This commit is contained in:
Tom Henderson
2010-06-27 20:27:30 -07:00
parent bfa660bed1
commit e6328110db
8 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/python/apidefs/gcc-ILP32/ns3_module_core.py
View File

@@ -3131,7 +3131,7 @@ def register_functions(root_module):
module.add_function('TypeNameGet',
'std::string',
[],
template_parameters=['long long'])
template_parameters=['long'])
## type-name.h: extern std::string ns3::TypeNameGet() [free function]
module.add_function('TypeNameGet',
'std::string',

5
src/devices/uan/uan-channel.cc
View File

@@ -40,13 +40,12 @@
NS_LOG_COMPONENT_DEFINE ("UanChannel");
namespace ns3 {
NS_OBJECT_ENSURE_REGISTERED ( UanChannel);
NS_OBJECT_ENSURE_REGISTERED (UanChannel);
TypeId
UanChannel::GetTypeId ()
{
static TypeId tid =
TypeId ("ns3::UanChannel")
static TypeId tid = TypeId ("ns3::UanChannel")
.SetParent<Channel> ()
.AddConstructor<UanChannel> ()
.AddAttribute ("PropagationModel",

2
src/devices/uan/uan-header-common.cc
View File

@@ -23,6 +23,8 @@
namespace ns3 {
NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon);
UanHeaderCommon::UanHeaderCommon ()
{
}

7
src/devices/uan/uan-header-rc.cc
View File

@@ -25,6 +25,12 @@
namespace ns3 {
NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcData);
NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcRts);
NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCtsGlobal);
NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCts);
NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcAck);
UanHeaderRcData::UanHeaderRcData ()
: Header (),
m_frameNo (0),
@@ -44,7 +50,6 @@ UanHeaderRcData::~UanHeaderRcData ()
{
}
TypeId
UanHeaderRcData::GetTypeId ()
{

2
src/devices/uan/uan-header-rc.h
View File

@@ -190,7 +190,7 @@ public:
UanHeaderRcCtsGlobal (Time wt, Time ts, uint16_t rate, uint16_t retryRate);
~UanHeaderRcCtsGlobal ();
static TypeId GetTypeId ();
static TypeId GetTypeId (void);
/**
* \param rate Rate number corresponding to data rate of current cycle

2
src/devices/uan/uan-mac-rc-gw.cc
View File

@@ -91,7 +91,7 @@ UanMacRcGw::DoDispose ()
TypeId
UanMacRcGw::GetTypeId (void)
{
TypeId tid = TypeId ("ns3::UanMacRcGw")
static TypeId tid = TypeId ("ns3::UanMacRcGw")
.SetParent<UanMac> ()
.AddConstructor<UanMacRcGw> ()
.AddAttribute ("MaxReservations",

2
src/devices/uan/uan-mac-rc.cc
View File

@@ -190,7 +190,7 @@ UanMacRc::DoDispose ()
TypeId
UanMacRc::GetTypeId (void)
{
TypeId tid = TypeId ("ns3::UanMacRc")
static TypeId tid = TypeId ("ns3::UanMacRc")
.SetParent<UanMac> ()
.AddConstructor<UanMacRc> ()
.AddAttribute ("RetryRate",

3
src/devices/uan/uan-phy-gen.cc
View File

@@ -251,8 +251,7 @@ UanPhyPerUmodem::~UanPhyPerUmodem ()
TypeId UanPhyPerUmodem::GetTypeId (void)
{
static TypeId tid =
TypeId ("ns3::UanPhyPerUmodem")
static TypeId tid = TypeId ("ns3::UanPhyPerUmodem")
.SetParent<Object> ()
.AddConstructor<UanPhyPerUmodem> ()
;