From e6328110db96c54bc9c45f4149e4be9af5ad2a47 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Sun, 27 Jun 2010 20:27:30 -0700
Subject: [PATCH] Cleanup object registration for uan

---
 bindings/python/apidefs/gcc-ILP32/ns3_module_core.py | 2 +-
 src/devices/uan/uan-channel.cc                       | 5 ++---
 src/devices/uan/uan-header-common.cc                 | 2 ++
 src/devices/uan/uan-header-rc.cc                     | 7 ++++++-
 src/devices/uan/uan-header-rc.h                      | 2 +-
 src/devices/uan/uan-mac-rc-gw.cc                     | 2 +-
 src/devices/uan/uan-mac-rc.cc                        | 2 +-
 src/devices/uan/uan-phy-gen.cc                       | 3 +--
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py
index 26a6c31cd..9632618b2 100644
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py
@@ -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', 
diff --git a/src/devices/uan/uan-channel.cc b/src/devices/uan/uan-channel.cc
index 736a7ecbd..b0fc35cc6 100644
--- a/src/devices/uan/uan-channel.cc
+++ b/src/devices/uan/uan-channel.cc
@@ -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",
diff --git a/src/devices/uan/uan-header-common.cc b/src/devices/uan/uan-header-common.cc
index 35eee0832..0ffdd51cb 100644
--- a/src/devices/uan/uan-header-common.cc
+++ b/src/devices/uan/uan-header-common.cc
@@ -23,6 +23,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon);
+
 UanHeaderCommon::UanHeaderCommon ()
 {
 }
diff --git a/src/devices/uan/uan-header-rc.cc b/src/devices/uan/uan-header-rc.cc
index 19eceffe6..6f55ea9a3 100644
--- a/src/devices/uan/uan-header-rc.cc
+++ b/src/devices/uan/uan-header-rc.cc
@@ -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 ()
 {
diff --git a/src/devices/uan/uan-header-rc.h b/src/devices/uan/uan-header-rc.h
index 4ffccf1b9..2509aa76d 100644
--- a/src/devices/uan/uan-header-rc.h
+++ b/src/devices/uan/uan-header-rc.h
@@ -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
diff --git a/src/devices/uan/uan-mac-rc-gw.cc b/src/devices/uan/uan-mac-rc-gw.cc
index c2e584089..71a12e533 100644
--- a/src/devices/uan/uan-mac-rc-gw.cc
+++ b/src/devices/uan/uan-mac-rc-gw.cc
@@ -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",
diff --git a/src/devices/uan/uan-mac-rc.cc b/src/devices/uan/uan-mac-rc.cc
index 926d3a45a..2607a0d33 100644
--- a/src/devices/uan/uan-mac-rc.cc
+++ b/src/devices/uan/uan-mac-rc.cc
@@ -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",
diff --git a/src/devices/uan/uan-phy-gen.cc b/src/devices/uan/uan-phy-gen.cc
index a81b201dd..7cf4dc43c 100644
--- a/src/devices/uan/uan-phy-gen.cc
+++ b/src/devices/uan/uan-phy-gen.cc
@@ -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> ()
   ;