--- a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc	Thu Oct 17 17:33:30 2013 +0300
@@ -60,16 +60,8 @@
 }
 
 
-void
-A2A4RsrqHandoverAlgorithm::DoDispose ()
-{
-  NS_LOG_FUNCTION (this);
-  delete m_handoverManagementSapProvider;
-}
-
-
 TypeId
-A2A4RsrqHandoverAlgorithm::GetTypeId (void)
+A2A4RsrqHandoverAlgorithm::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::A2A4RsrqHandoverAlgorithm")
     .SetParent<LteHandoverAlgorithm> ()
@@ -136,6 +128,14 @@
 
 
 void
+A2A4RsrqHandoverAlgorithm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  delete m_handoverManagementSapProvider;
+}
+
+
+void
 A2A4RsrqHandoverAlgorithm::DoReportUeMeas (uint16_t rnti,
                                            LteRrcSap::MeasResults measResults)
 {

--- a/src/lte/model/a2-a4-rsrq-handover-algorithm.h	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.h	Thu Oct 17 17:33:30 2013 +0300
@@ -86,8 +86,7 @@
   virtual ~A2A4RsrqHandoverAlgorithm ();
 
   // inherited from Object
-  virtual void DoDispose (void);
-  static TypeId GetTypeId (void);
+  static TypeId GetTypeId ();
 
   // inherited from LteHandoverAlgorithm
   virtual void SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s);
@@ -99,6 +98,7 @@
 protected:
   // inherited from Object
   virtual void DoInitialize ();
+  virtual void DoDispose ();
 
   // inherited from LteHandoverAlgorithm as a Handover Management SAP implementation
   void DoReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults);

--- a/src/lte/model/a3-rsrp-handover-algorithm.cc	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/a3-rsrp-handover-algorithm.cc	Thu Oct 17 17:33:30 2013 +0300
@@ -46,16 +46,8 @@
 }
 
 
-void
-A3RsrpHandoverAlgorithm::DoDispose ()
-{
-  NS_LOG_FUNCTION (this);
-  delete m_handoverManagementSapProvider;
-}
-
-
 TypeId
-A3RsrpHandoverAlgorithm::GetTypeId (void)
+A3RsrpHandoverAlgorithm::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::A3RsrpHandoverAlgorithm")
     .SetParent<LteHandoverAlgorithm> ()
@@ -119,6 +111,14 @@
 
 
 void
+A3RsrpHandoverAlgorithm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  delete m_handoverManagementSapProvider;
+}
+
+
+void
 A3RsrpHandoverAlgorithm::DoReportUeMeas (uint16_t rnti,
                                          LteRrcSap::MeasResults measResults)
 {

--- a/src/lte/model/a3-rsrp-handover-algorithm.h	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/a3-rsrp-handover-algorithm.h	Thu Oct 17 17:33:30 2013 +0300
@@ -73,8 +73,7 @@
   virtual ~A3RsrpHandoverAlgorithm ();
 
   // inherited from Object
-  virtual void DoDispose (void);
-  static TypeId GetTypeId (void);
+  static TypeId GetTypeId ();
 
   // inherited from LteHandoverAlgorithm
   virtual void SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s);
@@ -86,6 +85,7 @@
 protected:
   // inherited from Object
   virtual void DoInitialize ();
+  virtual void DoDispose ();
 
   // inherited from LteHandoverAlgorithm as a Handover Management SAP implementation
   void DoReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults);

--- a/src/lte/model/lte-anr.cc	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/lte-anr.cc	Thu Oct 17 17:33:30 2013 +0300
@@ -53,17 +53,8 @@
 }
 
 
-void
-LteAnr::DoDispose ()
-{
-  NS_LOG_FUNCTION (this);
-  delete m_anrSapProvider;
-  m_neighbourRelationTable.clear ();
-}
-
-
 TypeId
-LteAnr::GetTypeId (void)
+LteAnr::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::LteAnr")
     .SetParent<Object> ()
@@ -149,6 +140,15 @@
 
 
 void
+LteAnr::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  delete m_anrSapProvider;
+  m_neighbourRelationTable.clear ();
+}
+
+
+void
 LteAnr::DoReportUeMeas (LteRrcSap::MeasResults measResults)
 {
   uint8_t measId = measResults.measId;

--- a/src/lte/model/lte-anr.h	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/lte-anr.h	Thu Oct 17 17:33:30 2013 +0300
@@ -89,8 +89,7 @@
   virtual ~LteAnr ();
 
   // inherited from Object
-  virtual void DoDispose (void);
-  static TypeId GetTypeId (void);
+  static TypeId GetTypeId ();
 
   /**
    * \brief Provide an advance information about a related neighbouring cell
@@ -139,6 +138,7 @@
 protected:
   // inherited from Object
   virtual void DoInitialize ();
+  virtual void DoDispose ();
 
 private:
 

--- a/src/lte/model/lte-handover-algorithm.cc	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/lte-handover-algorithm.cc	Thu Oct 17 17:33:30 2013 +0300
@@ -39,14 +39,8 @@
 }
 
 
-void
-LteHandoverAlgorithm::DoDispose ()
-{
-}
-
-
 TypeId
-LteHandoverAlgorithm::GetTypeId (void)
+LteHandoverAlgorithm::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::LteHandoverAlgorithm")
     .SetParent<Object> ()
@@ -55,4 +49,11 @@
 }
 
 
+void
+LteHandoverAlgorithm::DoDispose ()
+{
+}
+
+
+
 } // end of namespace ns3

--- a/src/lte/model/lte-handover-algorithm.h	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/lte-handover-algorithm.h	Thu Oct 17 17:33:30 2013 +0300
@@ -70,8 +70,7 @@
   virtual ~LteHandoverAlgorithm ();
 
   // inherited from Object
-  virtual void DoDispose (void);
-  static TypeId GetTypeId (void);
+  static TypeId GetTypeId ();
 
   /**
    * \brief Set the "user" part of the Handover Management SAP interface that
@@ -90,6 +89,9 @@
 
 protected:
 
+  // inherited from Object
+  virtual void DoDispose ();
+
   // HANDOVER MANAGEMENT SAP PROVIDER IMPLEMENTATION
 
   /**

--- a/src/lte/model/no-op-handover-algorithm.cc	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/no-op-handover-algorithm.cc	Thu Oct 17 17:33:30 2013 +0300
@@ -52,7 +52,7 @@
 
 
 TypeId
-NoOpHandoverAlgorithm::GetTypeId (void)
+NoOpHandoverAlgorithm::GetTypeId ()
 {
   static TypeId tid = TypeId ("ns3::NoOpHandoverAlgorithm")
     .SetParent<LteHandoverAlgorithm> ()

--- a/src/lte/model/no-op-handover-algorithm.h	Thu Oct 17 17:21:14 2013 +0300
+++ b/src/lte/model/no-op-handover-algorithm.h	Thu Oct 17 17:33:30 2013 +0300
@@ -49,8 +49,7 @@
   virtual ~NoOpHandoverAlgorithm ();
 
   // inherited from Object
-  virtual void DoDispose (void);
-  static TypeId GetTypeId (void);
+  static TypeId GetTypeId ();
 
   // inherited from LteHandoverAlgorithm
   virtual void SetLteHandoverManagementSapUser (LteHandoverManagementSapUser* s);
@@ -62,6 +61,7 @@
 protected:
   // inherited from Object
   virtual void DoInitialize ();
+  virtual void DoDispose ();
 
   // inherited from LteHandoverAlgorithm as a Handover Management SAP implementation
   void DoReportUeMeas (uint16_t rnti, LteRrcSap::MeasResults measResults);