Adapt to changes in NS-3

Sikabo · Sikabo · commit d1c0cdc9d7b5 · 2025-11-25T16:29:58.000+01:00
For more information see: https://gitlab.com/nsnam/ns-3-dev/-/merge_requests/2287 Signed-off-by: Anders Martinsson <anders.martinsson@sikabo.com>
diff --git a/helper/dce-manager-helper.cc b/helper/dce-manager-helper.cc
@@ -39,11 +39,6 @@ DceManagerHelper::GetTypeId (void)
   ;
   return tid;
 }
-TypeId
-DceManagerHelper::GetInstanceTypeId (void) const
-{
-  return DceManagerHelper::GetTypeId ();
-}
 
 DceManagerHelper::DceManagerHelper ()
 {
diff --git a/helper/dce-manager-helper.h b/helper/dce-manager-helper.h
@@ -83,7 +83,6 @@ class DceManagerHelper : public Object
 {
 public:
   static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
 
   /**
    * Construct a DceManagerHelper
diff --git a/model/dce-node-context.cc b/model/dce-node-context.cc
@@ -46,11 +46,6 @@ DceNodeContext::GetTypeId (void)
 
   return tid;
 }
-TypeId
-DceNodeContext::GetInstanceTypeId (void) const
-{
-  return DceNodeContext::GetTypeId ();
-}
 DceNodeContext::DceNodeContext ()
 {
   m_randomCtx = CreateObject<NormalRandomVariable> ();
diff --git a/model/dce-node-context.h b/model/dce-node-context.h
@@ -43,7 +43,6 @@ class DceNodeContext : public Object
 {
 public:
   static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
 
   DceNodeContext ();
   virtual ~DceNodeContext ();
diff --git a/model/local-datagram-socket-fd.cc b/model/local-datagram-socket-fd.cc
@@ -44,11 +44,6 @@ LocalDatagramSocketFd::GetTypeId (void)
 
   return tid;
 }
-TypeId
-LocalDatagramSocketFd::GetInstanceTypeId (void) const
-{
-  return LocalDatagramSocketFd::GetTypeId ();
-}
 LocalDatagramSocketFd::LocalDatagramSocketFd (Ptr<LocalSocketFdFactory> f)
   : m_state (CREATED),
     m_peer (0)
diff --git a/model/local-datagram-socket-fd.h b/model/local-datagram-socket-fd.h
@@ -48,7 +48,6 @@ class LocalDatagramSocketFd : public LocalSocketFd
 {
 public:
   static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
 
   LocalDatagramSocketFd (Ptr<LocalSocketFdFactory> f);
   virtual ~LocalDatagramSocketFd ();
diff --git a/model/local-socket-fd-factory.cc b/model/local-socket-fd-factory.cc
@@ -40,11 +40,6 @@ LocalSocketFdFactory::GetTypeId (void)
 
   return tid;
 }
-TypeId
-LocalSocketFdFactory::GetInstanceTypeId (void) const
-{
-  return LocalSocketFdFactory::GetTypeId ();
-}
 LocalSocketFdFactory::LocalSocketFdFactory ()
   : m_totalBuffersSize (0)
 {
diff --git a/model/local-socket-fd-factory.h b/model/local-socket-fd-factory.h
@@ -36,7 +36,6 @@ class LocalSocketFdFactory : public SocketFdFactory
 {
 public:
   static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
 
   LocalSocketFdFactory ();
   virtual void DoDispose ();
diff --git a/model/local-socket-fd.cc b/model/local-socket-fd.cc
@@ -41,11 +41,6 @@ LocalSocketFd::GetTypeId (void)
 
   return tid;
 }
-TypeId
-LocalSocketFd::GetInstanceTypeId (void) const
-{
-  return LocalSocketFd::GetTypeId ();
-}
 LocalSocketFd::LocalSocketFd () : m_readBuffer (0),
                                   m_readBufferSize (0),
                                   m_sendTimeout (0),
diff --git a/model/local-socket-fd.h b/model/local-socket-fd.h
@@ -47,7 +47,6 @@ class LocalSocketFd : public UnixFd
 {
 public:
   static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
 
   LocalSocketFd ();
   virtual ~LocalSocketFd ();
diff --git a/model/local-stream-socket-fd.cc b/model/local-stream-socket-fd.cc
@@ -45,11 +45,6 @@ LocalStreamSocketFd::GetTypeId (void)
 
   return tid;
 }
-TypeId
-LocalStreamSocketFd::GetInstanceTypeId (void) const
-{
-  return LocalStreamSocketFd::GetTypeId ();
-}
 LocalStreamSocketFd::LocalStreamSocketFd (Ptr<LocalSocketFdFactory> f)
   : m_state (CREATED),
     m_backLog (0)
diff --git a/model/local-stream-socket-fd.h b/model/local-stream-socket-fd.h
@@ -50,7 +50,6 @@ class LocalStreamSocketFd : public LocalSocketFd
 {
 public:
   static TypeId GetTypeId (void);
-  virtual TypeId GetInstanceTypeId (void) const;
 
   LocalStreamSocketFd (Ptr<LocalSocketFdFactory> f);
   LocalStreamSocketFd (LocalStreamSocketFd *peer, std::string connectPath);

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,6 @@ DceManagerHelper::GetTypeId (void)`
`39`	`39`	`;`
`40`	`40`	`return tid;`
`41`	`41`	`}`
`42`		`-TypeId`
`43`		`-DceManagerHelper::GetInstanceTypeId (void) const`
`44`		`-{`
`45`		`- return DceManagerHelper::GetTypeId ();`
`46`		`-}`
`47`	`42`
`48`	`43`	`DceManagerHelper::DceManagerHelper ()`
`49`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ class DceManagerHelper : public Object`
`83`	`83`	`{`
`84`	`84`	`public:`
`85`	`85`	`static TypeId GetTypeId (void);`
`86`		`- virtual TypeId GetInstanceTypeId (void) const;`
`87`	`86`
`88`	`87`	`/**`
`89`	`88`	`* Construct a DceManagerHelper`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,6 @@ DceNodeContext::GetTypeId (void)`
`46`	`46`
`47`	`47`	`return tid;`
`48`	`48`	`}`
`49`		`-TypeId`
`50`		`-DceNodeContext::GetInstanceTypeId (void) const`
`51`		`-{`
`52`		`- return DceNodeContext::GetTypeId ();`
`53`		`-}`
`54`	`49`	`DceNodeContext::DceNodeContext ()`
`55`	`50`	`{`
`56`	`51`	`m_randomCtx = CreateObject<NormalRandomVariable> ();`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ class DceNodeContext : public Object`
`43`	`43`	`{`
`44`	`44`	`public:`
`45`	`45`	`static TypeId GetTypeId (void);`
`46`		`- virtual TypeId GetInstanceTypeId (void) const;`
`47`	`46`
`48`	`47`	`DceNodeContext ();`
`49`	`48`	`virtual ~DceNodeContext ();`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ class LocalDatagramSocketFd : public LocalSocketFd`
`48`	`48`	`{`
`49`	`49`	`public:`
`50`	`50`	`static TypeId GetTypeId (void);`
`51`		`- virtual TypeId GetInstanceTypeId (void) const;`
`52`	`51`
`53`	`52`	`LocalDatagramSocketFd (Ptr<LocalSocketFdFactory> f);`
`54`	`53`	`virtual ~LocalDatagramSocketFd ();`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,6 @@ LocalSocketFdFactory::GetTypeId (void)`
`40`	`40`
`41`	`41`	`return tid;`
`42`	`42`	`}`
`43`		`-TypeId`
`44`		`-LocalSocketFdFactory::GetInstanceTypeId (void) const`
`45`		`-{`
`46`		`- return LocalSocketFdFactory::GetTypeId ();`
`47`		`-}`
`48`	`43`	`LocalSocketFdFactory::LocalSocketFdFactory ()`
`49`	`44`	`: m_totalBuffersSize (0)`
`50`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ class LocalSocketFdFactory : public SocketFdFactory`
`36`	`36`	`{`
`37`	`37`	`public:`
`38`	`38`	`static TypeId GetTypeId (void);`
`39`		`- virtual TypeId GetInstanceTypeId (void) const;`
`40`	`39`
`41`	`40`	`LocalSocketFdFactory ();`
`42`	`41`	`virtual void DoDispose ();`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ class LocalSocketFd : public UnixFd`
`47`	`47`	`{`
`48`	`48`	`public:`
`49`	`49`	`static TypeId GetTypeId (void);`
`50`		`- virtual TypeId GetInstanceTypeId (void) const;`
`51`	`50`
`52`	`51`	`LocalSocketFd ();`
`53`	`52`	`virtual ~LocalSocketFd ();`